[commits] Horde branch master updated. 3fddeb862d2ef9653e0552556d161d8521e42469

Jan Schneider jan at horde.org
Mon Apr 8 10:04:42 UTC 2013


The branch "master" has been updated.
The following is a summary of the commits.

from: e66c0b4d9b40c9af8b9040a47ba1e92542a487ea

4e0b499 Merge branch 'master' into imp_6_1
ebe0cee Fix method name
03cf5e3 Merge branch 'master' into imp_6_1
d8f18e6 Remove merge artifact
2b27d4b Clean up some unused variables
a15a3e8 Merge branch 'master' into imp_6_1
333f331 Hidden session ID data no longer needed.
45c0659 [mms] All Ingo templates now use Horde_View.
ac9228b Merge branch 'master' into imp_6_1
ed35911 condense if statement; phpdoc
e948772 Added simple jsmin test
ba58f78 Merge branch 'master' into imp_6_1
6ad8182 [mms] Initialize viewport and mailbox list in single AJAX call when initially loading the dynamic mailbox view.
6932f3a Remove 'ask' option for the 'request_mdn' preference
8a1b7a2 Merge branch 'master' into imp_6_1
ba7c1b3 Merge branch 'master' into imp_6_1
1744f47 Merge branch 'master' into imp_6_1
e4a7358 phpdoc
2491e4e Optimize tokenizer
4386381 Merge branch 'master' into imp_6_1
583c384 Create mailbox is a better description
1635be0 Merge branch 'master' into imp_6_1
8d2c1c1 fix tostring - it is causing segfaults for some reason if casting master object to a string
9a39c73 Fix iterator flushing within sublevel objects
f955928 Merge branch 'master' into imp_6_1
0b3d5e9 Merge branch 'master' into imp_6_1
92b1182 Use new Imap_Client SORT_*_FALLBACK criteria to sort address fields
d135590 Merge branch 'master' into imp_6_1
8eabecf Merge branch 'master' into imp_6_1
a3b99e2 Revert "[mms] All Ingo templates now use Horde_View."
290a10e [mms] Use more efficient murmurhash3 to determine changes in compose message that will trigger auto saved drafts.
b195670 Merge branch 'master' into imp_6_1
d50b5e5 Bug #11925: Translation fixes
87063e1 Fix scrolling in dynamic thread view popup
f494820 Merge IMP_Mailbox_List and IMP_Mailbox_List_Track
9de5543 Remove IMP_Mailbox_List#getIMAPIndex()
0534bc7 Move search related code from IMP_Mailbox_List to extended IMP_Mailbox_List_Virtual class
52d5686 Merge branch 'master' into imp_6_1
04033c3 Merge branch 'master' into imp_6_1
5287c8d Merge branch 'master' into imp_6_1
9ca7152 Merge branch 'master' into imp_6_1
5d047d7 Merge branch 'master' into imp_6_1
aa86580 [mms] Abstract all UIDs used for mailbox/message navigation on the browser to BUIDs (browser UIDs) (Bug #10719).
a48dc00 [mms] Display Virtual Folders in smartmobile view.
5114bfb Fix typo
86a7b3e thismailbox no longer exists (thankfully)
bb77c58 Fixes to IMP::composeLink()
185f37c Fixes/cleanups from BUIDs rewrite
6b1b21c Merge branch 'master' into imp_6_1
3f02e74 Fix typo
699adba Fix missing comma
e414f77 Merge branch 'master' into imp_6_1
d63cc9b Merge branch 'master' into imp_6_1
c185b0a Move attachment-related options in dynamic compose screen to dropdown adjacent to attachment upload element
a5e30c0 Make linking attachments a run-time decision when calling buildAndSendMessage()
de60c20 [mms] Support link attachment feature in dynamic view.
2cc8207 [mms] Converted 'link_all_attachments' configuration option to the 'link_attach' preference.
9b900eb Merge branch 'master' into imp_6_1
da62bfa More fixes for BUID conversion
3cae0ff Fix typo
357fb90 [mms] Smartmobile view now uses additive loading instead of pagination on the mailbox page.
212909e Merge branch 'master' into imp_6_1
0a63162 Move PGP public key attachment to send-time decision
5ed7264 Move Vcard attachment to send-time decision
5eae49a Abstract context checkbox code on dynamic compose screen.
fc26058 [mms] Support attaching PGP public keys in dynamic compose.
c7ca080 [mms] Support attaching vCard in dynamic compose.
69bbf84 Fix viewport data loss in smartmobile view
4bb6ff1 Merge branch 'master' into imp_6_1
6e79818 Make sure there is at least one message
4f9c982 Optimize going from text->html if there is no current compose text
a27500a Merge branch 'master' into imp_6_1
8b7409c This should be on by default for signatures
d95fb3a filter on display not needed here
2d9faf1 [mms] Remove 'compose_cc' and 'compose_bcc' preferences.
aa5c032 Allow PDF thumbnails to be disabled
afe4eec Allow image thumbnails to be disabled
1fbdb70 Remove signature hook
a2928af DIMP -> Dynamic
af09a7d Merge branch 'master' into imp_6_1
b468ebf [mms] Dynamically display MIME type icon for attachments uploaded on the dynamic compose page.
52c4119 Merge branch 'master' into imp_6_1
263d99a Fix parsing msgload parameter
010bb0a [mms] Save AJAX showMessage call when reloading the dynamic mailbox page with a message preview active.
a09e914 Fix pre-buffering of unseen messages in dynamic view
947c900 Make sure there are not duplicate Ids
035bfce Fix selecting messages in mailbox view
acc0173 Get rid of IMP_Ui_Folders
12de76b IMP_Ui_Imageview -> IMP_Images
59d45d6 IMP_Ui_Editor -> IMP_Editor
07a9b8b IMP_Ui_Headers -> IMP_Mime_Headers
72344b8 IMP_Ui_Contacts -> IMP_Contacts
74719b0 Remove unneeded mode parameter to two hooks
f7113a7 Start moving basic view pages to separate view libraries
da92c59 Convert basic folders page to View library
cddf1b2 Convert saveimage page to View library
278f3f9 Convert thread page to View library
281650c These are not used anymore
f88e530 Convert basic search page to View library
eeae092 Convert advanced search page to View library
8523580 Convert compose page to View library
d3ed0e5 IMP_Ui_Quota -> IMP_Quota_Ui
26192f8 This method is only used internally in one class
7ba7a83 Convert message page to View library
d1945ed Convert mailbox page to View library
f14846b Cleanup getInitialPage() usage
bf69544 Convert pgp page to View library
10baf87 Convert smime page to View library
362f8b2 IMP::header() no longer needed
bfc25c1 [mms] All basic view pages are now routed through the basic.php endpoint.
89250b8 More cleanup of index mailbox tracking
8dae680 Fix typo
5c04f92 Merge branch 'master' into imp_6_1
9856731 IMP::canCompose() -> IMP_Compose::canCompose()
1d1c290 IMP::applyFilters() -> IMP_Filter::canApplyFilters()
25aed8f Move CKEditor paste/drag code to a separate plugin
152b3f7 Fixes for view library conversion
b9fda61 Merge branch 'master' into imp_6_1
72c8c35 Merge branch 'master' into imp_6_1
d4c6dcf Move paste plugin -> pasteignore
b0456ae Merge branch 'master' into imp_6_1
78de597 Merge branch 'master' into imp_6_1
920191e Additional check to ensure temporary compose files are deleted on logout
80d21fb Initial work in allowing pasting of data (images) into HTML editor
df7e4d8 Fix regression removing setting of part type for attachments
25e5a53 More succinct MIME Part labels
f5615cf Added compose-cacheid AJAX task
a4c0092 Use Horde_Url_Data to generate attachment icon graphics
ceb7814 Added compose-atc AJAX task
5b82728 Merge branch 'master' into imp_6_1
b5e5b2d Get better attachment filename for data without one (e.g. pasted data)
e73a1bd Rewritten compose attachment code
be454c4 VFS_ATTACH_PATH has moved
8967a6d Another place we use VFS_ATTACH_PATH
4bdef54 Merge branch 'master' into imp_6_1
9df2b9d Cleanup addRelatedAttachment() method to prepare for additional of related parts from browser data
b25ac38 Fix variable
a6811ce Add IMP_Compose_Attachment#viewUrl()
e10ac99 Fix undefined variable
f4eb53e Fix function call
675fa68 [mms] Allow drag & drop/pasting of images into the HTML editor.
daf9d61 Fix deleting attachments from dynamic view
e4b4668 Fix PHP issue causing only the first attachment's data to be inserted into the message
34c51bf Don't show attachment info for related data
be25f23 Merge branch 'master' into imp_6_1
8417da6 No need to determine size if we are deleting all attachments
5ee5144 [mms] Add image upload feature to the HTML editor image plugin.
974541b Add button shortcut on initial ckeditor plugin page to open the upload tab
70b2a1c Actually use the correct attachment ID
5f96e6d Fix minimal page links
857cd83 [mms] Minimal menu entries are now accessible via numbered accesskeys (Request #5847).
d42933d Fix template location
d74533c Merge branch 'master' into imp_6_1
9082c54 More fixes to compose attachment access
1f1bc7c Consistently use IMP_Compose_Attachment#viewUrl() to generate attachment data view URL
c7c0882 Store compose cache ID in attachment objects
4ed1f12 Merge branch 'master' into imp_6_1
c443620 'page' is used for name of page view; use mpage to indicate mailbox page number
92851e5 [mms] Add discard draft option to compose page allowing the user to cancel composition and permanently delete the original draft (Request #12017).
c0ce7a6 Fix disappear proccessing when not using threaded sort
c8f09fe Fix viewing all parts
061d271 Tweak changelog entry
d8302a4 [mms] Rewritten/improved linked attachment code.
6beee13 IMP_Mailbox_Ui::getSize() -> IMP::sizeFormat()
cc5c35f update package.xml requirements
9e43806 Use injector to determine if mail logging is available
4536af0 whoops
5fd8e21 Excessively wordy
0d43e01 Merge branch 'master' into imp_6_1
309b2df Upgrade old linked attachments
8397821 Number(undefined) resolved to NaN instead of false
651f77c Fix doubleclick template/resume actions
6f29e87 Merge branch 'master' into imp_6_1
7d62b21 Foo
967fd40 sanity checking not needed here
5f95730 Revert "Foo"
19769da Merge branch 'master' into imp_6_1
89c0be5 Cleaner linking of S/MIME certificate details
91045b0 Fix message actions from popup windows
74d64e8 Simplify storage/retrieval of IMP_Imap object
8006f72 use globals
80dbdfb Convert IMAP/POP3 object detection to factor in the current mailbox
87c2cee phpdoc
a960ece Abstract retrieval of IMAP client object
3c54064 Not used
b10a1c6 Re-add total message count to smartmobile mailbox screen
b65085c Merge branch 'master' into imp_6_1
19702a1 Add access_flags and access_search properties to IMP_Mailbox
48c264a Merge branch 'master' into imp_6_1
235380d Move "More" actions on smartmobile message page to popup
c93005b Fix updating message count when deleting last message in mailbox
d08c8b7 Merge branch 'smartmobile-more' into imp_6_1
2cd11f0 Fix broken merge from master
ebdab50 Merge branch 'master' into imp_6_1
487bc96 [mms] Re-add alerts log to dynamic mailbox view.
41a80b5 IE7 is no longer supported for dynamic view
f3db74e Merge branch 'master' into imp_6_1
5045603 tempid not needed; just use regular id
e4db119 Remove duplicate attribute
c98b096 [mms] Spam/innocent reporting on the smartmobile message page now uses a popup instead of a modal dialog.
5dd525b Fix returning flag updates
a0785df Always require click of subnit button for copy/move in smartmobile view
11ad550 Add overlay behind spam/innocent reporting dialog popup
6bceb56 this is expected behavior
da3c437 Merge branch 'master' into imp_6_1
c444ffb Merge branch 'master' into imp_6_1
8b280e3 [mms] Linked attachments are no longer a user-configurable action.
032460c Determine attachment limit on server side, not browser side
e35032d Attachment size limitations need to be checked at attachment time to produce the correct results
9fcc462 Hint to PHP server about max POST file size in dynamic view
ca83260 IMP_Compose_LinkedAttachment::create() -> IMP_Compose#createLinkedAtc()
8e5c0d1 For pasted images, transfer to linked attachment sending if it exceeds the threshold
827308f [mms] Added argument to the 'trailer' hook to allow HTML trailers to be generated.
d303e7c Charset conversion got lost
2520d39 Merge branch 'master' into imp_6_1
d254d65 Manipulate HTML compose message entirely via DOMDocument
d8c2ef2 [mms] Add linked attachment information directly to main body text.
947400a Merge branch 'master' into imp_6_1
e3f208d Merge branch 'master' into imp_6_1
14a928a ws
16b4b7d [mms] Added the 'attach_body_check' hook.
39ef3dc [mms] Add the 'msg_filter' hook.
85ad408 Missed this deletion
7241fa9 Fixes caught by PHPMD
396c211 Merge branch 'master' into imp_6_1
075e1f9 Fix display of attach options in basic compose screen
7705894 [mms] Can't add charset directly to HTML document or else DOM will alter document when generating HTML.
84a280d [mms] Fix replacing spellchecker elements within tables (Bug #12028).
3246291 Merge branch 'master' into imp_6_1
a05806c Fix sending attachments
679511e phpdoc
ff50de0 IMP_Prefs_Sort_Fixed -> IMP_Prefs_Sort_FixedDate
885d1e6 [mms] Disable mailbox sorting by default if the remote server does not natively support it (Bug #12001).
f26e1da Cleanups of linked attachment code
562ca57 Add link_attach_vfs hook
49f413c Better display of Hide/Show Addresses link
fb18391 Fix class name
bf0a7d2 Merge branch 'master' into imp_6_1
6a69fc5 Merge branch 'master' into imp_6_1
6c1d57b Merge branch 'master' into imp_6_1
d663357 Fix displaying innocent button in popup message display
a713567 Improved handling of spam/innocent actions in dynamic views
68241f5 Make sure this value exists
8708e99 Cache prefto value
e130e9a Do fixed mailbox check on server side, not browser
802ab94 Convert script to Horde_Argv
bb56897 This is handled by horde
6543be6 Fix providing initial information to smartmobile view
0303844 Experiment without page transitions, since they are broken on various mobile browsers
8132d5a Merge branch 'master' into imp_6_1
171263d Better check
8c17ef1 Fix action name
fe22750 Improved handling of forwarded attachment
cc2fb8f Fix changing sort
56d857e More robust handling of errors when removing an attachment
74d46d6 Fix the actual deletion of the attachment
ab16477 jsfixes caught by jshint
36dc979 Merge branch 'master' into imp_6_1
ff67838 Fix copy/move regression in smartmobile view
82b82ab Always ask for initial viewport return when needed
8b9b94e Better placeholder text for folder filter
b786e98 We've already done this check
f47e404 Merge branch 'master' into imp_6_1
b226d2e This got lost somewhere
1195c82 Clearer
acd7a04 Setup drag/drop attachments just once per page
e3409f3 More efficient mouseover handler
abab783 More optimizations to event handlers
5b33c26 float is reserved - use cssFloat instead
50797de Fix undefined variable
262813b js cleanups
0caa43a Merge branch 'master' into imp_6_1
3e0a92d Consistency/cleanups in prefs descriptions
c330159 Merge branch 'master' into imp_6_1
b48ace5 Need to do even more housekeeping in IMP 6.1 when stripping a part (Bug #12058)
c4692ba Merge branch 'master' into imp_6_1
36e7ff1 Obviously another botched merge
74a3d30 Merge branch 'master' into imp_6_1
4c14c08 Only do if successful
00c1f13 Show flag/innocent icon immediately after reporting to indicate to user something happened
d1e9b98 Missing static declaration
9e711b1 Simplify check
fe51d09 Merge branch 'master' into imp_6_1
0d0b2c3 [mms] Add SMTP debugging.
4a12b24 config docs
a929a55 Merge branch 'master' into imp_6_1
a06ffb5 Fix unit tests due to identity framework changes
d6b6456 Convert shutdown methods to Horde_Queue tasks
fb507e2 Merge branch 'master' into imp_6_1
f1a7a44 This needs to go into Horde_Core
75852de Merge branch 'master' into imp_6_1
cc2cd47 Merge branch 'master' into imp_6_1
0553002 Fix linking attachments when HTML is not used
6f3969d Add debug/debug_raw example options to advanced imap config
f2fd2d8 [mms] Move folder disabling configuration into backends.php.
514f534 [mms] Move special mailboxes autocreation configuration into backends.php.
7cdd4d9 [mms] Move fixed mailbox configuration into backends.php.
4f79722 Fixed for purposes of dynamic view also includes ACL restrictions
120b6ca Imap_Client optimizes out empty arrays, so need to do explicit checks at runtime
bfef895 Don't permanently save the save_sent_mail value in the backend if logging into POP server
715ff38 Add IMP_Mailbox constants linked to the name of the special mailbox prefs
06761a3 [mms] Allow default special mailbox names to be overriden by a backend.
b28d651 Merge branch 'master' into imp_6_1
a472018 Use Horde_ShutdownRunner
94fc3cb Fix resolving UIDs for POP3 servers
572091f Merge branch 'master' into imp_6_1
0ec4a8b Better way to clear the search form
3239904 simplify
d4df69b Unnecessary
7e8ba94 Placeholder to allow for easy debugging of jqm
0a267ba [mms] Add link to exit out of search view in smartmobile view into the original mailbox.
1c4f953 [mms] Allow the active search query to be edited in the smartmobile view.
34b4855 Merge branch 'master' into imp_6_1
775dadc Merge branch 'master' into imp_6_1
6bc7bb5 Convert to Horde_Shutdown
c9e12bc [mms] Upgraded IMP permissions to allow permissions to be set per active backend.
a98773b Merge branch 'master' into imp_6_1
ba86663 phpdoc
40fb9e6 Leave compose recipient restriction permissions as global, not per backend
d4559cf phpdoc
636b86d Remove the mbox_special hook - this can be configured in backends.php now
c39e416 tweaks
9f57ff7 phpdoc
064d906 Abstract ACL class to work even if the underlying server does not natively support ACL
7a0f485 ws
4bce7e4 [mms] Add the 'mbox_acl' hook.
7686c2f More compact variable name
884b2cd Move more IMAP session setup code into IMP_Imap
66eb74d Remove mimp_advanced hook
92aa4c1 phpdoc
2f80dbe Merge branch 'master' into imp_6_1
dc95a98 Take idea from k-9 mail: scroll down to top of message content when first loading message
76f040c Not needed
4992ac9 Merge branch 'master' into imp_6_1
008b1ab Use Horde_Compress_Fast to detrmine compressed size instead of directly calling lzf
8bbace4 doc tweak
e45e3c9 Merge branch 'master' into imp_6_1
5c3925f phpdoc
dd4e239 Simplify backend examples
cfdcbd1 Merge branch 'master' into imp_6_1
4cdc843 [mms] Support showing blocked Data URIs in HTML message data.
60e6c32 Fix incorrect argument warnings
ec0f1ce [mms] Spam reporting configuration has been moved to the backends file.
e34c59b A bit more moving around in the backends.php file
a769f77 Forgot to remove spamfolder config remnants
da0c400 Merge branch 'master' into imp_6_1
3828266 Standardize on 'innocent', not 'notspam'
0fdff7f Fix setting spam parameters in the session
79eafab Need to check for existence of false for innocent display
eb69634 Don't shell escape e-mail replacements
24dfbb3 [mms] Move backend configuration parsing/retrieval to IMP_Imap_Config.
322c806 These variables should be stored in IMAP object
35ca36a Merge branch 'master' into imp_6_1
93141da phpdoc
711e62c Fix __isset()
79b4a5f Fix dangling closing XML tag
a8950c4 Merge branch 'master' into imp_6_1
fcd8d30 Re-add caching of backends file
34a95a6 Merge branch 'master' into imp_6_1
b1e4cd4 Merge branch 'master' into imp_6_1
6ba474a Maybe a slightly more useful error message?
fb5da82 Merge branch 'master' into imp_6_1
d068b98 Merge branch 'master' into imp_6_1
dae6be3 Merge branch 'master' into imp_6_1
633620d Destination mailbox when copying/moving message in smartmobile view cannot be empty
d1fe98c Merge branch 'master' into imp_6_1
2dc187c Remove dimp_messageview and dimp_previewview hooks
a3594cf Merge branch 'master' into imp_6_1
2ddb77b Update phpdoc
8299261 [mms] Add properties to Sync object to allow retrieval of previous sync state status.
2f0ba0a Merge branch 'master' into imp_6_1
1c4748a [mms] Better handling of flag change attempts when browser cached state (dynamic/smartmobile view) is different than the server state.
375a787 Merge branch 'master' into imp_6_1
c9fca9e requestid might be empty
2de2941 Fixes to new MODIFIED checking code
67806ee Merge branch 'master' into imp_6_1
161047b Merge branch 'master' into imp_6_1
8e70c08 more better english
7f20142 ajaxaction is a very specialized hook - no need to provide example here
a1ccb07 Merge branch 'master' into imp_6_1
5307efd Expose the Maillog via the public API, add ability to poll for changes.
17b2e16 Merge branch 'master' into imp_6_1
5ba40c2 Merge branch 'master' into imp_6_1
75b92fc Fix migration script
9e83070 phpdoc
8d3d85a Fix bad merge.
a1912ab changes
1a1cd4b Fix regression in transparent authentication.
cdddd3b Fix property name.
0eefc0a phpdoc
9cae75f IMP_Auth::transparent() no longer returns the array of session values.
02c06e1 Remove package.xml changelog for 6.1.0
b8a813f Fix copy/paste error
489c2f7 This is already marked global
79cd0aa Merge branch 'master' into imp_6_1
76eed54 Merge branch 'master' into imp_6_1
5a49f1f [mms] Add PGP keylength configuration option (Request #12099).
dfeb2a2 [mms] Honor forward_default preference in smartmobile view.
79c8bc1 Merge branch 'master' into imp_6_1
9083b8b Fix missing gettext strings
901a6a1 Rewrite attachment storage backend
3afec36 Merge branch 'master' into imp_6_1
79972c5 [mms] Rename 'compose_attach' hook as 'compose_attachment'.
7b4dbba Update filelist
0182d22 Remove unused code
b6c1823 Only filter in textual data
d55fcad Don't need Horde_String::lower() here - we are only matching ASCII text so if this are indeed some crazy multiibyte string, it wouldn't match anyway
84416cd Revert "Don't need Horde_String::lower() here - we are only matching ASCII text so if this are indeed some crazy multiibyte string, it wouldn't match anyway"
9160cf9 Need to document this BC API break
274eb82 There is no guarantee that maillog is available
22a3163 callAction() has been moved to Horde_Core 2.5.0
8205046 Move draft actions to a separate handler
ee44efa [mms] Add saving compose drafts in smartmobile view.
435864a Fix parsing compose cacheid in smartmobile view
aec0ed9 Merge branch 'master' into imp_6_1
ead01da phpdoc
69537be Get rid of IMP::bareAddress()
d704918 Merge branch 'master' into imp_6_1
3982abd More succinct
fb4ac49 Move compose link related methods from IMP to IMP_Compose_Link
7645610 Merge branch 'master' into imp_6_1
6ae28cc Get rid of compose header
6d73b17 IMP_Compose#replyMessage() now returns address objects instead of strings.
587f2e3 IMP::parseAddressList() now supports Horde_Mail_Rfc822_List objects natively
c2997eb phpdoc
397e36e Don't return headers array from IMP_Compose#forwardMessage()
f4b42d2 Draft resuming methods no longer return headers array
f9c2938 Pass reply addresses to dynamic views as an array instead of a string
cdc3142 [mms] Improved autocompleter in smartmobile compose view.
22180cc This is no longer used
2d28e9e Don't output summary information when viewing in smartmobile view
bff4789 Allow MIME status objects to identify which views to be displayed in.
9874ac7 [mms] Add HTML image/style blocking to smartmobile view.
309ee28 Theming for image view button
a6840c8 Better screen positioning on message open
b4d4a7e Fix displaying size in the attachment listing
f139b48 Improvements/fixes to resizing code in smartmobile HTML image blocking code
0c98299 Use one() here
5f0907b simplify
b35ea37 Fix direct loading of compose page
b79bb81 Highlight email addresses with a different theme
e15cce0 Improved image unblocking code in basic and dynamic view
dfa663f Merge branch 'master' into imp_6_1
be45e37 Fix running IMP's GarbageCollection login task.
5b9b601 Add missing closing configswitch tag.
593d5b4 phpdoc
e217d34 This is an optional argument
d6b4789 ws
9ed4e9f Fix replying to a list
d250853 Fix draft resuming
4ca76a8 Move discard actions into popup menu
c286c7d Better generation of message popup menu
1f548f5 PATH_INFO is not specifically needed by IMP
3dc49a0 phpdoc
a78d176 Fix test
a4501f7 Add clear sort to dynamic view
b56aa5c addPopdownButton is redundant
f222dba Merge branch 'master' into imp_6_1
0919568 Address information is not sent in forward requests
053353d Attachment size now returned formatted in AJAX task
71d4887 Show compose attachment information in smartmobile view
506431a [mms] Add attachment upload capability to smartmobile compose page.
ac3c7d0 Fix hiding attachment upload if limit has been reached
5df2862 Hide browser file input widget
c0025b3 [mms] Hide browser generated file input widget for attachment upload in dynamic compose page.
68fd8de Fix replying to related parts
e31f31a These files should be removed at the end of the request
30b7243 Merge branch 'master' into imp_6_1
b5e92fa Commented out value should be the value to trigger the described activity
bef44e3 Fix delivering address/subject information to dynamic compose window.
c34fba5 Simpler way of hiding upload widget
c97daf2 Fix scrolling of ITIP data in the compose_attach preview in dynamic mode
de41ea8 Improve waiting behavior when importing a mailbox file
9ba745c This needs an argument.
159462f [mms] Allow attachments to be dragged/dropped from local filesystem on the dyanmic compose page.
0d6566e Merge branch 'master' into imp_6_1
f4ee345 Merge branch 'master' into imp_6_1
7d0ced8 Provide SSL/TLS information in test script
b86c432 Merge branch 'master' into imp_6_1
445728b Fix adding address to image unblock list
4f7b11f Fix undefined error
74b511d fix key value
03fcc14 Various coding style fixes
b81e024 Can't call reset() on virtual property
dc5f2f9 Merge branch 'master' into imp_6_1
1ed696e Merge branch 'master' into imp_6_1
c3e031a Merge branch 'master' into imp_6_1
4f9fe8f Merge branch 'master' into imp_6_1
ba6c76d No dom load method in this class
1ed4e5c Fix botched merge
2094f30 this needs to be a string
4ed2ff0 Fix function name
3fddeb8 Merge branch 'imp_6_1'

-----------------------------------------------------------------------

commit 4e0b49944eacd08df0d36e842e3b5c7f260f8f22
Merge: b64d23d 5e085ae
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 7 22:05:24 2012 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	framework/Imap_Client/package.xml
    	imp/docs/CHANGES
    	imp/lib/Application.php
    	imp/package.xml

 agora/lib/Form/Forum.php                                          |    2 +-
 agora/lib/Form/Search.php                                         |    2 +-
 ansel/lib/Form/Ecard.php                                          |    2 +-
 ansel/lib/Form/Image.php                                          |    2 +-
 ansel/lib/Form/ImageDate.php                                      |    2 +-
 ansel/lib/Form/Upload.php                                         |    2 +-
 ansel/lib/Form/Watermark.php                                      |    2 +-
 ansel/package.xml                                                 |   52 +-
 beatnik/lib/Forms/Autogenerate.php                                |    2 +-
 beatnik/lib/Forms/DeleteRecord.php                                |    2 +-
 beatnik/lib/Forms/EditRecord.php                                  |    2 +-
 bundles/groupware/docs/CHANGES                                    |   97 +-
 bundles/groupware/docs/PERFORMANCE                                |   44 +-
 bundles/groupware/docs/RELEASE_NOTES                              |   49 +-
 bundles/groupware/lib/Bundle.php                                  |    2 +-
 bundles/groupware/package.xml                                     |   35 +-
 bundles/webmail/docs/CHANGES                                      |  130 +-
 bundles/webmail/docs/PERFORMANCE                                  |   49 +-
 bundles/webmail/docs/RELEASE_NOTES                                |   68 +-
 bundles/webmail/lib/Bundle.php                                    |    2 +-
 bundles/webmail/package.xml                                       |   39 +-
 components/bin/horde-components                                   |    6 +-
 components/lib/Components/Release/Task/CommitPostRelease.php      |   11 +-
 components/lib/Components/Release/Task/NextSentinel.php           |   11 +-
 components/lib/Components/Release/Task/NextVersion.php            |   12 +-
 components/package.xml                                            |    2 +
 .../Components/Unit/Components/Release/Task/NextSentinelTest.php  |    2 +-
 content/package.xml                                               |   18 +-
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |   12 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |   21 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/Autodiscover.php      |   23 +-
 framework/ActiveSync/package.xml                                  |    8 +-
 framework/Alarm/package.xml                                       |   23 +-
 framework/Argv/package.xml                                        |   23 +-
 framework/Auth/locale/Horde_Auth.pot                              |   26 +-
 framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.mo                |  Bin 3104 -> 3104 bytes
 framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.po                |   26 +-
 framework/Auth/locale/fi/LC_MESSAGES/Horde_Auth.mo                |  Bin 3175 -> 3175 bytes
 framework/Auth/locale/fi/LC_MESSAGES/Horde_Auth.po                |   26 +-
 framework/Autoloader_Cache/lib/Horde/Autoloader/Cache.php         |   34 +-
 framework/Autoloader_Cache/package.xml                            |    9 +-
 framework/Browser/package.xml                                     |   23 +-
 framework/Cli/package.xml                                         |   23 +-
 framework/Compress/package.xml                                    |   23 +-
 framework/Core/lib/Horde/Config.php                               |    6 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   32 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/InPlaceEditor.php        |    6 +-
 framework/Core/lib/Horde/Core/Auth/Application.php                |   10 +-
 framework/Core/lib/Horde/Core/Factory/Weather.php                 |    2 +-
 framework/Core/lib/Horde/Core/Perms/Ui.php                        |    2 +-
 framework/Core/lib/Horde/Core/Smartmobile/View/Helper.php         |    6 +-
 framework/Core/lib/Horde/Core/Topbar.php                          |    2 +-
 framework/Core/lib/Horde/Core/Ui/ModalFormRenderer.php            |    2 +-
 framework/Core/lib/Horde/Help.php                                 |    2 +-
 framework/Core/lib/Horde/PageOutput.php                           |   30 +-
 framework/Core/locale/Horde_Core.pot                              |    8 +-
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.mo                |  Bin 19930 -> 19930 bytes
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.po                |    8 +-
 framework/Core/locale/fi/LC_MESSAGES/Horde_Core.mo                |  Bin 19125 -> 19125 bytes
 framework/Core/locale/fi/LC_MESSAGES/Horde_Core.po                |   50 +-
 framework/Core/package.xml                                        |   34 +-
 framework/Crypt/locale/Horde_Crypt.pot                            |   38 +-
 framework/Crypt/locale/de/LC_MESSAGES/Horde_Crypt.mo              |  Bin 7765 -> 7765 bytes
 framework/Crypt/locale/de/LC_MESSAGES/Horde_Crypt.po              |   38 +-
 framework/Crypt/locale/fi/LC_MESSAGES/Horde_Crypt.mo              |  Bin 7291 -> 7291 bytes
 framework/Crypt/locale/fi/LC_MESSAGES/Horde_Crypt.po              |   38 +-
 framework/Crypt/package.xml                                       |   24 +-
 framework/Data/package.xml                                        |   23 +-
 framework/Date/package.xml                                        |   24 +-
 framework/Exception/package.xml                                   |   23 +-
 framework/Form/lib/Horde/Form.php                                 |    7 +-
 framework/Form/locale/Horde_Form.pot                              |   10 +-
 framework/Form/locale/de/LC_MESSAGES/Horde_Form.mo                |  Bin 10966 -> 10966 bytes
 framework/Form/locale/de/LC_MESSAGES/Horde_Form.po                |   10 +-
 framework/Form/locale/fi/LC_MESSAGES/Horde_Form.mo                |  Bin 10838 -> 10838 bytes
 framework/Form/locale/fi/LC_MESSAGES/Horde_Form.po                |   10 +-
 framework/Icalendar/package.xml                                   |   23 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |   20 +-
 framework/Imap_Client/locale/Horde_Imap_Client.pot                |   92 +-
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 7080 -> 7138 bytes
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.po  |   94 +-
 framework/Imap_Client/locale/fi/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 6511 -> 6574 bytes
 framework/Imap_Client/locale/fi/LC_MESSAGES/Horde_Imap_Client.po  |   94 +-
 framework/Imap_Client/package.xml                                 |   35 +-
 framework/Imsp/package.xml                                        |   23 +-
 framework/Itip/package.xml                                        |   23 +-
 .../Horde/Kolab/Storage/List/Query/List/Cache/Synchronization.php |    4 +-
 framework/Kolab_Storage/locale/Horde_Kolab_Storage.pot            |   12 +-
 .../Kolab_Storage/locale/de/LC_MESSAGES/Horde_Kolab_Storage.mo    |  Bin 5932 -> 5932 bytes
 .../Kolab_Storage/locale/de/LC_MESSAGES/Horde_Kolab_Storage.po    |   12 +-
 .../Kolab_Storage/locale/fi/LC_MESSAGES/Horde_Kolab_Storage.mo    |  Bin 5890 -> 5890 bytes
 .../Kolab_Storage/locale/fi/LC_MESSAGES/Horde_Kolab_Storage.po    |   12 +-
 framework/Kolab_Storage/package.xml                               |   21 +-
 framework/LoginTasks/package.xml                                  |   23 +-
 framework/Mime/package.xml                                        |   23 +-
 framework/Mime_Viewer/package.xml                                 |   23 +-
 framework/Nls/package.xml                                         |   23 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/Ignore/Symlink.php |   42 +
 framework/Pear/lib/Horde/Pear/Package/Type/Horde.php              |    1 +
 framework/Pear/package.xml                                        |   16 +-
 .../test/Horde/Pear/Unit/Package/Contents/Ignore/SymlinkTest.php  |   84 +
 framework/Perms/package.xml                                       |   23 +-
 framework/Prefs/package.xml                                       |   23 +-
 framework/Release/lib/Horde/Release/Freecode.php                  |    8 +-
 framework/Release/package.xml                                     |   23 +-
 framework/Rpc/lib/Horde/Rpc/ActiveSync.php                        |    6 +-
 framework/Rpc/package.xml                                         |   26 +-
 framework/Secret/test/Horde/Secret/Unit/SecretTest.php            |    8 +-
 framework/Service_Facebook/package.xml                            |   23 +-
 framework/Service_Weather/locale/Horde_Service_Weather.pot        |    7 +-
 .../locale/de/LC_MESSAGES/Horde_Service_Weather.mo                |  Bin 12193 -> 12010 bytes
 .../locale/de/LC_MESSAGES/Horde_Service_Weather.po                |    9 +-
 .../locale/fi/LC_MESSAGES/Horde_Service_Weather.mo                |  Bin 12910 -> 12742 bytes
 .../locale/fi/LC_MESSAGES/Horde_Service_Weather.po                |    7 +-
 framework/Service_Weather/package.xml                             |   26 +-
 framework/Share/package.xml                                       |   23 +-
 framework/Support/lib/Horde/Support/Uuid.php                      |   17 +-
 framework/Support/package.xml                                     |   21 +-
 framework/SyncMl/lib/Horde/SyncMl/Device.php                      |    2 +
 framework/SyncMl/package.xml                                      |   23 +-
 framework/Text_Filter/package.xml                                 |   23 +-
 framework/Text_Filter/test/Horde/Text/Filter/Html2textTest.php    |   11 +
 framework/Timezone/package.xml                                    |   27 +-
 framework/Token/package.xml                                       |   23 +-
 framework/Vfs/package.xml                                         |   23 +-
 framework/bin/install_framework                                   |    8 +-
 gollem/package.xml                                                |   36 +-
 hermes/lib/Form/Deliverable.php                                   |    2 +-
 hermes/lib/Form/Deliverable/ClientSelector.php                    |    2 +-
 hermes/lib/Form/Export.php                                        |    2 +-
 hermes/lib/Form/JobType/Add.php                                   |    2 +-
 hermes/lib/Form/JobType/Edit/Step1.php                            |    2 +-
 hermes/lib/Form/Search.php                                        |    2 +-
 hermes/lib/Form/Time.php                                          |    2 +-
 hermes/locale/de/LC_MESSAGES/hermes.mo                            |  Bin 79668 -> 79668 bytes
 hermes/locale/de/LC_MESSAGES/hermes.po                            |   10 +-
 hermes/locale/fi/LC_MESSAGES/hermes.mo                            |  Bin 77341 -> 77427 bytes
 hermes/locale/fi/LC_MESSAGES/hermes.po                            |   98 +-
 hermes/locale/hermes.pot                                          |   10 +-
 hermes/package.xml                                                |   26 +-
 horde/admin/locale/hr/help.xml                                    |   26 +-
 horde/admin/locale/hu/help.xml                                    |   10 +-
 horde/admin/sessions.php                                          |    3 +-
 horde/admin/user.php                                              |    1 -
 horde/config/prefs.php                                            |    2 +-
 horde/docs/CHANGES                                                |   11 +-
 horde/docs/PERFORMANCE                                            |   29 +-
 horde/docs/RELEASE_NOTES                                          |   29 +-
 horde/docs/UPGRADING                                              |    6 +-
 horde/lib/Application.php                                         |    2 +-
 horde/lib/LoginTasks/SystemTask/Upgrade.php                       |   15 +-
 horde/locale/bg/help.xml                                          |   24 +-
 horde/locale/ca/help.xml                                          |   40 +-
 horde/locale/cs/help.xml                                          |   44 +-
 horde/locale/da/help.xml                                          |   24 +-
 horde/locale/de/LC_MESSAGES/horde.mo                              |  Bin 65325 -> 65325 bytes
 horde/locale/de/LC_MESSAGES/horde.po                              |   78 +-
 horde/locale/de/help.xml                                          |   21 +-
 horde/locale/el/help.xml                                          |   24 +-
 horde/locale/en/help.xml                                          |    4 +-
 horde/locale/es/help.xml                                          |   33 +-
 horde/locale/et/help.xml                                          |   24 +-
 horde/locale/eu/help.xml                                          |   38 +-
 horde/locale/fa/help.xml                                          |   38 +-
 horde/locale/fi/LC_MESSAGES/horde.mo                              |  Bin 63993 -> 63993 bytes
 horde/locale/fi/LC_MESSAGES/horde.po                              |   78 +-
 horde/locale/fi/help.xml                                          |   33 +-
 horde/locale/fr/help.xml                                          |   41 +-
 horde/locale/horde.pot                                            |   80 +-
 horde/locale/hr/help.xml                                          |   53 +-
 horde/locale/hu/help.xml                                          |   24 +-
 horde/locale/it/help.xml                                          |   47 +-
 horde/locale/ja/help.xml                                          |   24 +-
 horde/locale/ko/help.xml                                          |   24 +-
 horde/locale/lt/help.xml                                          |   24 +-
 horde/locale/lv/help.xml                                          |   32 +-
 horde/locale/nb/help.xml                                          |   24 +-
 horde/locale/nl/help.xml                                          |   24 +-
 horde/locale/nn/help.xml                                          |   24 +-
 horde/locale/pl/help.xml                                          |   24 +-
 horde/locale/pt/help.xml                                          |   44 +-
 horde/locale/pt_BR/help.xml                                       |   24 +-
 horde/locale/ru/help.xml                                          |   24 +-
 horde/locale/sk/help.xml                                          |   24 +-
 horde/locale/sl/help.xml                                          |   24 +-
 horde/locale/sv/help.xml                                          |   24 +-
 horde/locale/tr/help.xml                                          |   94 +-
 horde/locale/uk/help.xml                                          |   24 +-
 horde/locale/zh_CN/help.xml                                       |   24 +-
 horde/locale/zh_TW/help.xml                                       |   49 +-
 horde/package.xml                                                 |  307 +-
 horde/templates/admin/sessions.html.php                           |    2 +-
 imp/compose.php                                                   |   10 +-
 imp/docs/CHANGES                                                  |   27 +-
 imp/docs/RELEASE_NOTES                                            |   38 +-
 imp/js/compose-base.js                                            |   17 +
 imp/js/dimpbase.js                                                |   29 +-
 imp/js/dimpcore.js                                                |    7 +-
 imp/js/smartmobile.js                                             |    4 +-
 imp/lib/Ajax/Application.php                                      |  135 +-
 imp/lib/Ajax/Application/Handler/Common.php                       |  117 +
 imp/lib/Ajax/Application/Handler/Dynamic.php                      |   20 -
 imp/lib/Ajax/Application/Handler/Passphrase.php                   |    2 +-
 imp/lib/Ajax/Application/Handler/Smartmobile.php                  |   33 +-
 imp/lib/Ajax/Imple/ItipRequest.php                                |    9 +-
 imp/lib/Dynamic/Compose/Common.php                                |    2 +-
 imp/lib/LoginTasks/SystemTask/UpgradeAuth.php                     |    7 +-
 imp/lib/Minimal/Compose.php                                       |    2 +-
 imp/lib/Script/Package/ComposeBase.php                            |   30 +
 imp/locale/de/LC_MESSAGES/imp.mo                                  |  Bin 181608 -> 181624 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                  |  732 ++--
 imp/locale/fi/LC_MESSAGES/imp.mo                                  |  Bin 176082 -> 176177 bytes
 imp/locale/fi/LC_MESSAGES/imp.po                                  | 1033 +++--
 imp/locale/imp.pot                                                |  723 ++--
 imp/package.xml                                                   |   90 +-
 imp/view.php                                                      |    4 +-
 ingo/docs/CHANGES                                                 |    8 +-
 ingo/docs/RELEASE_NOTES                                           |   20 +-
 ingo/lib/Application.php                                          |    2 +-
 ingo/lib/Storage/Filters/Sql.php                                  |    6 +-
 ingo/locale/de/LC_MESSAGES/ingo.mo                                |  Bin 84643 -> 84643 bytes
 ingo/locale/de/LC_MESSAGES/ingo.po                                |   60 +-
 ingo/locale/fi/LC_MESSAGES/ingo.mo                                |  Bin 82935 -> 82889 bytes
 ingo/locale/fi/LC_MESSAGES/ingo.po                                |   68 +-
 ingo/locale/ingo.pot                                              |   62 +-
 ingo/package.xml                                                  |   50 +-
 jonah/lib/Form/Feed.php                                           |    2 +-
 jonah/lib/Form/Story.php                                          |    2 +-
 koward/lib/Koward/Form/Actions.php                                |    2 +-
 koward/lib/Koward/Form/Object.php                                 |    2 +-
 koward/lib/Koward/Form/Search.php                                 |    2 +-
 kronolith/docs/CHANGES                                            |    9 +-
 kronolith/docs/RELEASE_NOTES                                      |   28 +-
 kronolith/lib/Application.php                                     |    2 +-
 kronolith/locale/de/LC_MESSAGES/kronolith.mo                      |  Bin 126186 -> 126080 bytes
 kronolith/locale/de/LC_MESSAGES/kronolith.po                      |   14 +-
 kronolith/locale/fi/LC_MESSAGES/kronolith.mo                      |  Bin 123451 -> 123358 bytes
 kronolith/locale/fi/LC_MESSAGES/kronolith.po                      |   14 +-
 kronolith/locale/kronolith.pot                                    |   16 +-
 kronolith/migration/21_kronolith_upgrade_exceptionutc.php         |    2 +-
 kronolith/package.xml                                             |   97 +-
 mnemo/locale/de/LC_MESSAGES/mnemo.mo                              |  Bin 75050 -> 74891 bytes
 mnemo/locale/de/LC_MESSAGES/mnemo.po                              |   14 +-
 mnemo/locale/fi/LC_MESSAGES/mnemo.mo                              |  Bin 73495 -> 73356 bytes
 mnemo/locale/fi/LC_MESSAGES/mnemo.po                              |   14 +-
 mnemo/locale/mnemo.pot                                            |   16 +-
 mnemo/package.xml                                                 |   42 +-
 nag/lib/View/List.php                                             |    2 +-
 nag/locale/de/LC_MESSAGES/nag.mo                                  |  Bin 90992 -> 90841 bytes
 nag/locale/de/LC_MESSAGES/nag.po                                  |   17 +-
 nag/locale/fi/LC_MESSAGES/nag.mo                                  |  Bin 89217 -> 89093 bytes
 nag/locale/fi/LC_MESSAGES/nag.po                                  |   17 +-
 nag/locale/nag.pot                                                |   19 +-
 nag/package.xml                                                   |   48 +-
 nag/templates/list/_task.html.php                                 |    1 +
 passwd/package.xml                                                |   18 +-
 pastie/lib/Forms/Paste.php                                        |    2 +-
 sam/package.xml                                                   |    2 +-
 sesha/lib/Form/CategoryList.php                                   |    5 +-
 sesha/lib/Form/PropertyList.php                                   |    6 +-
 sesha/package.xml                                                 |   20 +-
 sesha/themes/default/graphics/administration.png                  |  Bin 562 -> 667 bytes
 timeobjects/package.xml                                           |   14 +-
 trean/lib/Forms/Search.php                                        |    2 +-
 turba/locale/de/LC_MESSAGES/turba.mo                              |  Bin 97216 -> 97106 bytes
 turba/locale/de/LC_MESSAGES/turba.po                              |   58 +-
 turba/locale/fi/LC_MESSAGES/turba.mo                              |  Bin 94659 -> 94569 bytes
 turba/locale/fi/LC_MESSAGES/turba.po                              |   58 +-
 turba/locale/turba.pot                                            |   60 +-
 turba/package.xml                                                 |   52 +-
 ulaform/package.xml                                               |    4 +-
 vilma/lib/Form/DeleteDomain.php                                   |    2 +-
 vilma/lib/Form/EditAlias.php                                      |    2 +-
 vilma/lib/Form/EditDomain.php                                     |    2 +-
 vilma/lib/Form/EditForward.php                                    |    2 +-
 vilma/lib/Form/EditUser.php                                       |    2 +-
 whups/lib/Form/Admin/AddUser.php                                  |    2 +-
 whups/lib/Form/Admin/EditQueueStepOne.php                         |    4 +-
 whups/lib/Form/Query/UserCriterion.php                            |    2 +-
 whups/package.xml                                                 |   44 +-
 wicked/package.xml                                                |   38 +-
 282 files changed, 4432 insertions(+), 4128 deletions(-)

http://git.horde.org/horde-git/-/commit/4e0b49944eacd08df0d36e842e3b5c7f260f8f22

-----------------------------------------------------------------------

commit ebe0cee7bec4c315c4f2b92bcc4cf71fa331ebb0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 7 22:16:03 2012 -0700

    Fix method name

 imp/lib/Mailbox/List/Track.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/ebe0cee7bec4c315c4f2b92bcc4cf71fa331ebb0

-----------------------------------------------------------------------

commit 03cf5e3a322f35ccad174bfec5c0b7c1ef945d3c
Merge: ebe0cee 6d372c0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Nov 10 19:49:46 2012 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/package.xml

 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |   18 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |   31 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php        |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php      |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |    1 -
 framework/ActiveSync/package.xml                                  |    4 +-
 framework/Compress/lib/Horde/Compress/Zip.php                     |   57 +-
 framework/Controller/package.xml                                  |    8 +-
 framework/Controller/test/Horde/Controller/Autoload.php           |   18 -
 framework/Core/package.xml                                        |    8 +-
 framework/Core/test/Horde/Core/Autoload.php                       |   17 -
 framework/Crypt_Blowfish/doc/Horde/Crypt/Blowfish/COPYING         |  458 ++++
 .../Crypt_Blowfish/doc/Horde/Crypt/Blowfish/ORIGINAL_LICENSE      |   30 +
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish.php             |  180 ++
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Base.php        |  129 ++
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Exception.php   |   17 +
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Mcrypt.php      |   88 +
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Openssl.php     |   47 +
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php.php         |   80 +
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php/Base.php    |  463 +++++
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php/Cbc.php     |   78 +
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php/Ecb.php     |   70 +
 framework/Crypt_Blowfish/package.xml                              |  128 ++
 framework/Crypt_Blowfish/test/Horde/Crypt/Blowfish/AllTests.php   |   36 +
 framework/Crypt_Blowfish/test/Horde/Crypt/Blowfish/CbcTest.php    |   76 +
 framework/Crypt_Blowfish/test/Horde/Crypt/Blowfish/EcbTest.php    |   76 +
 .../Crypt_Blowfish/test/Horde/Crypt/Blowfish/fixtures/vectors.txt |   41 +
 .../test/Horde/Crypt/Blowfish/fixtures/vectors_cbc.txt            |   33 +
 framework/Date/package.xml                                        |    8 +-
 framework/Date/test/Horde/Date/Autoload.php                       |   20 -
 framework/Exception/package.xml                                   |    8 +-
 framework/Exception/test/Horde/Exception/Autoload.php             |   23 -
 framework/Feed/package.xml                                        |    8 +-
 framework/Feed/test/Horde/Feed/Autoload.php                       |   17 -
 framework/Group/package.xml                                       |    8 +-
 framework/Group/test/Horde/Group/Autoload.php                     |   20 -
 framework/History/package.xml                                     |    8 +-
 framework/History/test/Horde/History/Autoload.php                 |   18 -
 framework/Http/package.xml                                        |    8 +-
 framework/Http/test/Horde/Http/Autoload.php                       |   17 -
 framework/Icalendar/package.xml                                   |    8 +-
 framework/Icalendar/test/Horde/Icalendar/Autoload.php             |   20 -
 framework/Image/package.xml                                       |    8 +-
 framework/Image/test/Horde/Image/Autoload.php                     |   20 -
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |    1 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Mailbox.php      |    9 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/String.php      |   42 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Sync.php         |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |  113 +-
 framework/Imap_Client/package.xml                                 |   23 +-
 framework/Imap_Client/test/Horde/Imap/Client/Autoload.php         |   23 -
 framework/Kolab_Server/package.xml                                |    8 +-
 framework/Kolab_Server/test/Horde/Kolab/Server/Autoload.php       |   17 -
 framework/Ldap/package.xml                                        |    8 +-
 framework/Ldap/test/Horde/Ldap/Autoload.php                       |   20 -
 framework/Mime/package.xml                                        |    8 +-
 framework/Mime/test/Horde/Mime/Autoload.php                       |   20 -
 framework/Perms/package.xml                                       |    8 +-
 framework/Perms/test/Horde/Perms/Autoload.php                     |   18 -
 framework/Secret/lib/Horde/Secret.php                             |    7 +-
 framework/Secret/package.xml                                      |   13 +-
 framework/Serialize/package.xml                                   |    8 +-
 framework/Serialize/test/Horde/Serialize/Autoload.php             |   17 -
 framework/Service_Gravatar/package.xml                            |   10 +-
 .../Service_Gravatar/test/Horde/Service/Gravatar/Autoload.php     |   18 -
 framework/Service_Weather/package.xml                             |    8 +-
 framework/Service_Weather/test/Horde/Service/Weather/Autoload.php |   18 -
 framework/SessionHandler/package.xml                              |    8 +-
 framework/SessionHandler/test/Horde/SessionHandler/Autoload.php   |   20 -
 framework/Stream/lib/Horde/Stream.php                             |   13 +-
 framework/Stream/lib/Horde/Stream/Existing.php                    |   40 +
 framework/Stream/package.xml                                      |   12 +-
 framework/Stream/test/Horde/Stream/ExistingTest.php               |  199 ++
 framework/Stream/test/Horde/Stream/fixtures/data.txt              |    1 +
 framework/Support/package.xml                                     |    8 +-
 framework/Support/test/Horde/Support/Autoload.php                 |   19 -
 framework/Template/package.xml                                    |    8 +-
 framework/Template/test/Horde/Template/Autoload.php               |   19 -
 framework/Text_Diff/package.xml                                   |    8 +-
 framework/Text_Diff/test/Horde/Text/Diff/Autoload.php             |   20 -
 framework/Text_Filter/package.xml                                 |    8 +-
 framework/Text_Filter/test/Horde/Text/Filter/Autoload.php         |   19 -
 framework/Text_Filter_Csstidy/package.xml                         |    8 +-
 .../test/Horde/Text/Filter/Csstidy/Autoload.php                   |   19 -
 framework/Text_Flowed/package.xml                                 |    8 +-
 framework/Text_Flowed/test/Horde/Text/Flowed/Autoload.php         |   17 -
 framework/Timezone/package.xml                                    |    8 +-
 framework/Timezone/test/Horde/Timezone/Autoload.php               |   20 -
 framework/Util/package.xml                                        |    8 +-
 framework/Util/test/Horde/Util/Autoload.php                       |   16 -
 framework/Vcs/package.xml                                         |   44 +-
 framework/Vcs/test/Horde/Vcs/Autoload.php                         |   20 -
 framework/Vfs/package.xml                                         |    8 +-
 framework/Vfs/test/Horde/Vfs/Autoload.php                         |   20 -
 framework/Xml_Element/package.xml                                 |    8 +-
 framework/Xml_Element/test/Horde/Xml/Element/Autoload.php         |   23 -
 framework/Xml_Wbxml/package.xml                                   |    8 +-
 framework/Xml_Wbxml/test/Horde/Xml/Wbxml/Autoload.php             |   20 -
 gollem/clipboard.php                                              |   29 +-
 gollem/docs/CHANGES                                               |    1 +
 gollem/edit.php                                                   |   12 +-
 gollem/js/manager.js                                              |    2 +-
 gollem/lib/Application.php                                        |    9 +-
 gollem/lib/Factory/Vfs.php                                        |    6 +-
 gollem/lib/Gollem.php                                             |    8 -
 gollem/manager.php                                                |  105 +-
 gollem/package.xml                                                |   48 +-
 gollem/quota.php                                                  |   30 +-
 gollem/selectlist.php                                             |   38 +-
 gollem/templates/clipboard.html.php                               |   55 +
 gollem/templates/clipboard/clipboard.html                         |   54 -
 gollem/templates/edit.html.php                                    |   14 +
 gollem/templates/edit/edit.inc                                    |   14 -
 gollem/templates/javascript_defs.php                              |   34 -
 gollem/templates/login/login.html                                 |   87 -
 gollem/templates/manager.html.php                                 |  174 ++
 gollem/templates/manager/manager.html                             |  177 --
 gollem/templates/quota.html.php                                   |   25 +
 gollem/templates/quota/quota.html                                 |   25 -
 gollem/templates/selectlist.html.php                              |   32 +
 gollem/templates/selectlist/selectlist.html                       |   33 -
 gollem/themes/default/graphics/clipboard.png                      |  Bin 379 -> 476 bytes
 gollem/themes/default/graphics/copy.png                           |  Bin 217 -> 442 bytes
 gollem/themes/default/graphics/cut.png                            |  Bin 228 -> 553 bytes
 gollem/themes/default/graphics/download.png                       |  Bin 190 -> 422 bytes
 gollem/themes/default/graphics/favicon.ico                        |  Bin 1092 -> 1742 bytes
 gollem/themes/default/graphics/folder.png                         |  Bin 583 -> 319 bytes
 gollem/themes/default/graphics/folder_create.png                  |  Bin 487 -> 434 bytes
 gollem/themes/default/graphics/folder_goto.png                    |  Bin 488 -> 441 bytes
 gollem/themes/default/graphics/folder_home.png                    |  Bin 481 -> 449 bytes
 gollem/themes/default/graphics/folder_symlink.png                 |  Bin 580 -> 548 bytes
 gollem/themes/default/graphics/gollem.png                         |  Bin 481 -> 319 bytes
 gollem/themes/default/graphics/perms.png                          |  Bin 243 -> 577 bytes
 gollem/themes/default/graphics/quota.png                          |  Bin 0 -> 610 bytes
 gollem/themes/default/graphics/reload.png                         |  Bin 261 -> 478 bytes
 gollem/themes/default/screen.css                                  |   20 +-
 gollem/view.php                                                   |    1 +
 horde/docs/INSTALL                                                |    9 -
 horde/lib/Test.php                                                |    4 -
 imp/docs/CHANGES                                                  |    5 +
 imp/js/dimpbase.js                                                |   12 +-
 imp/js/dimpcore.js                                                |    2 +-
 imp/js/smartmobile.js                                             |    2 -
 imp/lib/Ajax/Application.php                                      |    3 +-
 imp/lib/Ajax/Application/Handler/Common.php                       |    9 +-
 imp/lib/Ajax/Application/ListMessages.php                         |    3 -
 imp/lib/Ajax/Imple/ItipRequest.php                                |    2 +-
 imp/lib/Dynamic/Compose.php                                       |    6 +-
 imp/lib/Imap/Tree.php                                             |    4 +-
 imp/lib/Mailbox.php                                               |   19 +-
 imp/lib/Mailbox/List.php                                          |   87 -
 imp/lib/Mailbox/List/Track.php                                    |   80 +-
 imp/lib/Mbox/Parse.php                                            |   51 +-
 imp/lib/Ui/Folder.php                                             |   24 +-
 imp/package.xml                                                   |    4 +
 kronolith/templates/search/search.inc                             |   11 +-
 kronolith/templates/search/search_advanced.inc                    |   11 +-
 nag/docs/CHANGES                                                  |    1 +
 nag/lib/Api.php                                                   |    6 +-
 nag/package.xml                                                   |    4 +-
 160 files changed, 3248 insertions(+), 1639 deletions(-)

http://git.horde.org/horde-git/-/commit/03cf5e3a322f35ccad174bfec5c0b7c1ef945d3c

-----------------------------------------------------------------------

commit d8f18e65ecfaf6cc71674691b82ab8b789bb2e8f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Nov 10 22:05:16 2012 -0700

    Remove merge artifact

 imp/docs/CHANGES |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/d8f18e65ecfaf6cc71674691b82ab8b789bb2e8f

-----------------------------------------------------------------------

commit 2b27d4beab07ab597cbe57a1c14b43c08223bd6a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Nov 11 00:24:02 2012 -0700

    Clean up some unused variables

 imp/thread.php |   40 +++++++++++++++-------------------------
 1 files changed, 15 insertions(+), 25 deletions(-)

http://git.horde.org/horde-git/-/commit/2b27d4beab07ab597cbe57a1c14b43c08223bd6a

-----------------------------------------------------------------------

commit a15a3e87fb7570a6fc141d50e7893a530c34e2f8
Merge: 2b27d4b b31bdb6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Nov 12 22:51:05 2012 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/package.xml

 ansel/lib/Ajax/Imple/ToggleGalleryActions.php                     |    2 +-
 ansel/lib/Ajax/Imple/ToggleOtherGalleries.php                     |    2 +-
 bundles/groupware/docs/INSTALL                                    |   17 +-
 bundles/webmail/docs/INSTALL                                      |   17 +-
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php         |   14 -
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php   |   20 -
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |  111 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |   80 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php        |   23 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php       |   17 +-
 framework/ActiveSync/package.xml                                  |   53 +-
 framework/ActiveSync/test/Horde/ActiveSync/AllTests.php           |   35 +-
 framework/ActiveSync/test/Horde/ActiveSync/bootstrap.php          |    3 +
 framework/ActiveSync/test/Horde/ActiveSync/phpunit.xml            |    1 +
 framework/Alarm/test/Horde/Alarm/AllTests.php                     |   35 +-
 framework/Alarm/test/Horde/Alarm/bootstrap.php                    |    3 +
 framework/Alarm/test/Horde/Alarm/phpunit.xml                      |    1 +
 framework/Argv/test/Horde/Argv/AllTests.php                       |   42 +-
 framework/Argv/test/Horde/Argv/bootstrap.php                      |    3 +
 framework/Argv/test/Horde/Argv/phpunit.xml                        |    1 +
 framework/Auth/locale/ja/LC_MESSAGES/Horde_Auth.mo                |  Bin 3072 -> 3072 bytes
 framework/Auth/locale/ja/LC_MESSAGES/Horde_Auth.po                |   28 +-
 framework/Auth/test/Horde/Auth/AllTests.php                       |   37 +-
 framework/Auth/test/Horde/Auth/Autoload.php                       |    5 -
 framework/Auth/test/Horde/Auth/Unit/AuthTest.php                  |    9 +-
 framework/Auth/test/Horde/Auth/Unit/KolabTest.php                 |    8 +-
 framework/Auth/test/Horde/Auth/Unit/PasswdTest.php                |    8 +-
 framework/Auth/test/Horde/Auth/Unit/Sql/Base.php                  |    5 -
 framework/Auth/test/Horde/Auth/bootstrap.php                      |    3 +
 framework/Auth/test/Horde/Auth/phpunit.xml                        |    2 +-
 framework/Autoloader/test/Horde/Autoloader/AllTests.php           |   30 +-
 framework/Autoloader/test/Horde/Autoloader/bootstrap.php          |    3 +
 framework/Autoloader/test/Horde/Autoloader/phpunit.xml            |    1 +
 framework/Browser/lib/Horde/Browser.php                           |   39 +
 framework/Browser/package.xml                                     |    4 +-
 framework/Cli_Modular/test/Horde/Cli/Modular/AllTests.php         |   41 +-
 framework/Cli_Modular/test/Horde/Cli/Modular/Autoload.php         |    7 +-
 framework/Cli_Modular/test/Horde/Cli/Modular/Unit/ModularTest.php |    5 -
 .../test/Horde/Cli/Modular/Unit/ModuleProviderTest.php            |    5 -
 framework/Cli_Modular/test/Horde/Cli/Modular/Unit/ModulesTest.php |    5 -
 framework/Cli_Modular/test/Horde/Cli/Modular/bootstrap.php        |    3 +
 framework/Cli_Modular/test/Horde/Cli/Modular/phpunit.xml          |    2 +-
 framework/Compress/test/Horde/Compress/AllTests.php               |   33 +-
 framework/Compress/test/Horde/Compress/bootstrap.php              |    3 +
 framework/Compress/test/Horde/Compress/phpunit.xml                |    1 +
 framework/Constraint/test/Horde/Constraint/AllTests.php           |   31 +-
 framework/Constraint/test/Horde/Constraint/bootstrap.php          |    3 +
 framework/Constraint/test/Horde/Constraint/phpunit.xml            |    1 +
 framework/Controller/test/Horde/Controller/AllTests.php           |   38 +-
 framework/Controller/test/Horde/Controller/FilterRunnerTest.php   |    1 -
 framework/Controller/test/Horde/Controller/MockRequestTest.php    |    7 +-
 framework/Controller/test/Horde/Controller/StreamTest.php         |    7 +-
 framework/Controller/test/Horde/Controller/bootstrap.php          |    3 +
 framework/Controller/test/Horde/Controller/phpunit.xml            |    2 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   27 +-
 framework/Core/locale/ja/LC_MESSAGES/Horde_Core.mo                |  Bin 20703 -> 20703 bytes
 framework/Core/locale/ja/LC_MESSAGES/Horde_Core.po                |   52 +-
 framework/Core/test/Horde/Core/AllTests.php                       |   37 +-
 framework/Core/test/Horde/Core/Factory/GroupTest.php              |    7 +-
 framework/Core/test/Horde/Core/Factory/KolabServerTest.php        |    7 +-
 framework/Core/test/Horde/Core/Factory/KolabSessionTest.php       |    7 +-
 framework/Core/test/Horde/Core/SmartmobileUrlTest.php             |    5 -
 framework/Core/test/Horde/Core/UrlTest.php                        |    5 -
 framework/Core/test/Horde/Core/bootstrap.php                      |    3 +
 framework/Core/test/Horde/Core/phpunit.xml                        |    2 +-
 framework/Crypt/locale/ja/LC_MESSAGES/Horde_Crypt.mo              |  Bin 7624 -> 7624 bytes
 framework/Crypt/locale/ja/LC_MESSAGES/Horde_Crypt.po              |   40 +-
 framework/Crypt/test/Horde/Crypt/AllTests.php                     |   37 +-
 framework/Crypt/test/Horde/Crypt/bootstrap.php                    |    3 +
 framework/Crypt/test/Horde/Crypt/phpunit.xml                      |    1 +
 framework/Crypt_Blowfish/test/Horde/Crypt/Blowfish/AllTests.php   |   35 +-
 framework/Crypt_Blowfish/test/Horde/Crypt/Blowfish/bootstrap.php  |    3 +
 framework/Crypt_Blowfish/test/Horde/Crypt/Blowfish/phpunit.xml    |    1 +
 framework/Data/test/Horde/Data/AllTests.php                       |   35 +-
 framework/Data/test/Horde/Data/bootstrap.php                      |    3 +
 framework/Data/test/Horde/Data/phpunit.xml                        |    1 +
 framework/Date/test/Horde/Date/AllTests.php                       |   34 +-
 framework/Date/test/Horde/Date/DateTest.php                       |    2 -
 framework/Date/test/Horde/Date/RecurrenceTest.php                 |    2 -
 framework/Date/test/Horde/Date/SpanTest.php                       |    2 -
 framework/Date/test/Horde/Date/UtilsTest.php                      |    2 -
 framework/Date/test/Horde/Date/bootstrap.php                      |    3 +
 framework/Date/test/Horde/Date/phpunit.xml                        |    1 +
 framework/Date_Parser/test/Horde/Date/Parser/AllTests.php         |   34 +-
 framework/Date_Parser/test/Horde/Date/Parser/bootstrap.php        |    3 +
 framework/Date_Parser/test/Horde/Date/Parser/phpunit.xml          |    1 +
 framework/Db/test/Horde/Db/AllTests.php                           |   94 +-
 framework/Db/test/Horde/Db/bootstrap.php                          |    3 +
 framework/Db/test/Horde/Db/phpunit.xml                            |    1 +
 framework/Exception/test/Horde/Exception/AllTests.php             |   37 +-
 framework/Exception/test/Horde/Exception/ExceptionTest.php        |    7 +-
 framework/Exception/test/Horde/Exception/bootstrap.php            |    3 +
 framework/Exception/test/Horde/Exception/phpunit.xml              |    2 +-
 framework/Feed/test/Horde/Feed/AllTests.php                       |   30 +-
 framework/Feed/test/Horde/Feed/AtomEntryOnlyTest.php              |    4 -
 framework/Feed/test/Horde/Feed/AtomPublishingTest.php             |    4 -
 framework/Feed/test/Horde/Feed/BlogrollTest.php                   |    4 -
 framework/Feed/test/Horde/Feed/CountTest.php                      |    4 -
 framework/Feed/test/Horde/Feed/IteratorTest.php                   |    4 -
 framework/Feed/test/Horde/Feed/LexiconTest.php                    |    4 -
 framework/Feed/test/Horde/Feed/ReadTest.php                       |    4 -
 framework/Feed/test/Horde/Feed/bootstrap.php                      |    3 +
 framework/Feed/test/Horde/Feed/phpunit.xml                        |    2 +-
 framework/Form/locale/ja/LC_MESSAGES/Horde_Form.mo                |  Bin 11480 -> 11480 bytes
 framework/Form/locale/ja/LC_MESSAGES/Horde_Form.po                |   12 +-
 framework/Group/test/Horde/Group/AllTests.php                     |   34 +-
 framework/Group/test/Horde/Group/Base.php                         |    7 +-
 framework/Group/test/Horde/Group/bootstrap.php                    |    3 +
 framework/Group/test/Horde/Group/phpunit.xml                      |    1 +
 framework/History/test/Horde/History/AllTests.php                 |   37 +-
 framework/History/test/Horde/History/InterfaceTest.php            |    5 -
 framework/History/test/Horde/History/bootstrap.php                |    3 +
 framework/History/test/Horde/History/phpunit.xml                  |    2 +-
 framework/Http/test/Horde/Http/AllTests.php                       |   34 +-
 framework/Http/test/Horde/Http/ClientTest.php                     |    5 -
 framework/Http/test/Horde/Http/CurlTest.php                       |    5 -
 framework/Http/test/Horde/Http/FopenTest.php                      |    5 -
 framework/Http/test/Horde/Http/MockTest.php                       |    5 -
 framework/Http/test/Horde/Http/bootstrap.php                      |    3 +
 framework/Http/test/Horde/Http/phpunit.xml                        |    2 +-
 framework/Icalendar/test/Horde/Icalendar/AllTests.php             |   38 +-
 framework/Icalendar/test/Horde/Icalendar/TimezonesTest.php        |    2 -
 framework/Icalendar/test/Horde/Icalendar/bootstrap.php            |    3 +
 framework/Icalendar/test/Horde/Icalendar/phpunit.xml              |    1 +
 framework/Image/test/Horde/Image/AllTests.php                     |   34 +-
 framework/Image/test/Horde/Image/Exif/Base.php                    |    7 +-
 framework/Image/test/Horde/Image/bootstrap.php                    |    3 +
 framework/Image/test/Horde/Image/phpunit.xml                      |    1 +
 framework/Imap_Client/locale/ja/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 7289 -> 7359 bytes
 framework/Imap_Client/locale/ja/LC_MESSAGES/Horde_Imap_Client.po  |   94 +-
 framework/Imap_Client/test/Horde/Imap/Client/AllTests.php         |   49 +-
 framework/Imap_Client/test/Horde/Imap/Client/bootstrap.php        |    3 +
 framework/Imap_Client/test/Horde/Imap/Client/phpunit.xml          |    1 +
 framework/Injector/test/Horde/Injector/AllTests.php               |   30 +-
 framework/Injector/test/Horde/Injector/bootstrap.php              |    3 +
 framework/Injector/test/Horde/Injector/phpunit.xml                |    2 +-
 framework/Itip/test/Horde/Itip/AllTests.php                       |   44 +-
 framework/Itip/test/Horde/Itip/Autoload.php                       |    7 +-
 framework/Itip/test/Horde/Itip/Integration/ItipTest.php           |    5 -
 framework/Itip/test/Horde/Itip/Unit/Event/VeventTest.php          |   18 -
 framework/Itip/test/Horde/Itip/Unit/Response/Type/BaseTest.php    |    5 -
 framework/Itip/test/Horde/Itip/bootstrap.php                      |    3 +
 framework/Itip/test/Horde/Itip/phpunit.xml                        |    2 +-
 framework/Kolab_Cli/test/Horde/Kolab/Cli/AllTests.php             |   38 +-
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Autoload.php             |    5 -
 .../Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/Data/LedgerTest.php   |    5 -
 .../Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/Module/BaseTest.php   |    5 -
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/ModuleTest.php  |    5 -
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/OptionsTest.php |    5 -
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/CliTest.php         |    5 -
 framework/Kolab_Cli/test/Horde/Kolab/Cli/bootstrap.php            |    3 +
 framework/Kolab_Cli/test/Horde/Kolab/Cli/phpunit.xml              |    2 +-
 framework/Kolab_Config/test/Horde/Kolab/Config/AllTests.php       |   96 +-
 framework/Kolab_Config/test/Horde/Kolab/Config/Autoload.php       |    6 -
 .../test/Horde/Kolab/Config/Integration/ConfigTest.php            |    7 +-
 framework/Kolab_Config/test/Horde/Kolab/Config/bootstrap.php      |    3 +
 framework/Kolab_Config/test/Horde/Kolab/Config/phpunit.xml        |    2 +-
 framework/Kolab_Filter/test/Horde/Kolab/Filter/AllTests.php       |   86 +-
 framework/Kolab_Filter/test/Horde/Kolab/Filter/Autoload.php       |    5 -
 .../Kolab_Filter/test/Horde/Kolab/Filter/Integration/CliTest.php  |    5 -
 .../test/Horde/Kolab/Filter/Integration/IncomingTest.php          |    5 -
 .../test/Horde/Kolab/Filter/Unit/Helper/AddressFilter.php         |    7 +-
 framework/Kolab_Filter/test/Horde/Kolab/Filter/bootstrap.php      |    3 +
 framework/Kolab_Filter/test/Horde/Kolab/Filter/phpunit.xml        |    2 +-
 framework/Kolab_Format/test/Horde/Kolab/Format/AllTests.php       |   49 +-
 framework/Kolab_Format/test/Horde/Kolab/Format/Autoload.php       |    5 -
 .../test/Horde/Kolab/Format/Integration/ContactTest.php           |    5 -
 .../test/Horde/Kolab/Format/Integration/EventTest.php             |    5 -
 .../test/Horde/Kolab/Format/Integration/PreferencesTest.php       |    5 -
 .../test/Horde/Kolab/Format/Integration/RecurrenceTest.php        |    5 -
 .../Kolab_Format/test/Horde/Kolab/Format/Integration/TaskTest.php |    5 -
 .../Kolab_Format/test/Horde/Kolab/Format/Integration/XmlTest.php  |    5 -
 framework/Kolab_Format/test/Horde/Kolab/Format/Unit/DateTest.php  |    5 -
 .../test/Horde/Kolab/Format/Unit/Decorator/MemoryTest.php         |    5 -
 .../test/Horde/Kolab/Format/Unit/Decorator/TimedTest.php          |    5 -
 .../test/Horde/Kolab/Format/Unit/Exception/MissingUidTest.php     |    5 -
 .../test/Horde/Kolab/Format/Unit/Exception/MissingValueTest.php   |    5 -
 .../test/Horde/Kolab/Format/Unit/Exception/ParseErrorTest.php     |    5 -
 .../Kolab_Format/test/Horde/Kolab/Format/Unit/FactoryTest.php     |    5 -
 .../test/Horde/Kolab/Format/Unit/Xml/EnvelopeTest.php             |    5 -
 .../Kolab_Format/test/Horde/Kolab/Format/Unit/Xml/ParserTest.php  |    9 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/BooleanTest.php         |    5 -
 .../test/Horde/Kolab/Format/Unit/Xml/Type/ColorTest.php           |    5 -
 .../test/Horde/Kolab/Format/Unit/Xml/Type/CompositeTest.php       |    5 -
 .../test/Horde/Kolab/Format/Unit/Xml/Type/CreationDateTest.php    |   15 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/DateTimeTest.php        |    5 -
 .../test/Horde/Kolab/Format/Unit/Xml/Type/IntegerTest.php         |    5 -
 .../Horde/Kolab/Format/Unit/Xml/Type/ModificationDateTest.php     |   13 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/MultipleTest.php        |    5 -
 .../Horde/Kolab/Format/Unit/Xml/Type/PrefsApplicationTest.php     |    5 -
 .../test/Horde/Kolab/Format/Unit/Xml/Type/ProductIdTest.php       |    5 -
 .../test/Horde/Kolab/Format/Unit/Xml/Type/RecurrenceTest.php      |    5 -
 .../test/Horde/Kolab/Format/Unit/Xml/Type/RootTest.php            |    5 -
 .../test/Horde/Kolab/Format/Unit/Xml/Type/StringTest.php          |    5 -
 .../test/Horde/Kolab/Format/Unit/Xml/Type/UidTest.php             |    5 -
 framework/Kolab_Format/test/Horde/Kolab/Format/Unit/XmlTest.php   |    5 -
 framework/Kolab_Format/test/Horde/Kolab/Format/bootstrap.php      |    3 +
 framework/Kolab_Format/test/Horde/Kolab/Format/phpunit.xml        |    2 +-
 framework/Kolab_FreeBusy/test/Horde/Kolab/FreeBusy/AllTests.php   |   38 +-
 framework/Kolab_FreeBusy/test/Horde/Kolab/FreeBusy/Autoload.php   |    5 -
 .../test/Horde/Kolab/FreeBusy/Integration/DispatchTest.php        |    7 +-
 .../test/Horde/Kolab/FreeBusy/Integration/RedirectTest.php        |    7 +-
 .../test/Horde/Kolab/FreeBusy/Integration/TriggerTest.php         |    9 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Controller/MatchDictTest.php   |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Factory/BaseTest.php           |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/FreeBusyTest.php               |   20 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Freebusy/Factory/BaseTest.php  |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Freebusy/Helper/OwaTest.php    |    7 +-
 .../Horde/Kolab/FreeBusy/Unit/Freebusy/Helper/StatusMapTest.php   |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Freebusy/Params/FolderTest.php |    8 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Object/EventTest.php           |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Owner/Freebusy/KolabTest.php   |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Params/UserTest.php            |    7 +-
 .../Horde/Kolab/FreeBusy/Unit/Provider/Remote/PassThroughTest.php |    7 +-
 .../Horde/Kolab/FreeBusy/Unit/Provider/Remote/RedirectTest.php    |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Resource/Event/KolabTest.php   |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Resource/Event/OwaTest.php     |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Resource/KolabTest.php         |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/User/AnonymousTest.php         |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/User/Decorator/LogTest.php     |    7 +-
 .../test/Horde/Kolab/FreeBusy/Unit/User/KolabTest.php             |    7 +-
 framework/Kolab_FreeBusy/test/Horde/Kolab/FreeBusy/bootstrap.php  |    3 +
 framework/Kolab_FreeBusy/test/Horde/Kolab/FreeBusy/phpunit.xml    |    2 +-
 framework/Kolab_Resource/test/Horde/Kolab/Resource/Autoload.php   |    5 -
 framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php       |   37 +-
 .../test/Horde/Kolab/Server/Class/Server/Connection/MockTest.php  |    5 -
 .../test/Horde/Kolab/Server/Class/Server/Decorator/CleanTest.php  |    7 +-
 .../test/Horde/Kolab/Server/Class/Server/Decorator/LogTest.php    |    7 +-
 .../test/Horde/Kolab/Server/Class/Server/Ldap/ChangesTest.php     |    5 -
 .../Kolab/Server/Class/Server/Object/Attribute/ValueTest.php      |    7 +-
 .../Horde/Kolab/Server/Class/Server/Query/Element/MappedTest.php  |    5 -
 .../test/Horde/Kolab/Server/Class/Server/Query/ElementTest.php    |    5 -
 .../Horde/Kolab/Server/Class/Server/Search/Operation/GuidTest.php |    5 -
 .../test/Horde/Kolab/Server/Class/Server/Structure/KolabTest.php  |    5 -
 .../test/Horde/Kolab/Server/Integration/ObjectsTest.php           |    5 -
 .../Kolab_Server/test/Horde/Kolab/Server/Integration/Scenario.php |    5 -
 framework/Kolab_Server/test/Horde/Kolab/Server/TestCase.php       |    4 +-
 framework/Kolab_Server/test/Horde/Kolab/Server/bootstrap.php      |    3 +
 framework/Kolab_Server/test/Horde/Kolab/Server/phpunit.xml        |    2 +-
 framework/Kolab_Session/test/Horde/Kolab/Session/AllTests.php     |   49 +-
 framework/Kolab_Session/test/Horde/Kolab/Session/Autoload.php     |    5 -
 .../test/Horde/Kolab/Session/Integration/AnonymousTest.php        |    7 +-
 .../test/Horde/Kolab/Session/Integration/ValidTest.php            |    7 +-
 .../Kolab_Session/test/Horde/Kolab/Session/Unit/BaseTest.php      |    7 +-
 .../test/Horde/Kolab/Session/Unit/Decorator/AnonymousTest.php     |    7 +-
 .../test/Horde/Kolab/Session/Unit/Decorator/BaseTest.php          |    7 +-
 .../test/Horde/Kolab/Session/Unit/Decorator/LoggedTest.php        |    7 +-
 .../test/Horde/Kolab/Session/Unit/Decorator/StoredTest.php        |    7 +-
 .../Kolab_Session/test/Horde/Kolab/Session/Unit/ImapTest.php      |    7 +-
 .../test/Horde/Kolab/Session/Unit/Storage/MockTest.php            |    7 +-
 .../test/Horde/Kolab/Session/Unit/Storage/SessionTest.php         |    9 +-
 .../test/Horde/Kolab/Session/Unit/Valid/BaseTest.php              |    7 +-
 .../test/Horde/Kolab/Session/Unit/Valid/Decorator/LoggedTest.php  |    7 +-
 framework/Kolab_Session/test/Horde/Kolab/Session/bootstrap.php    |    3 +
 framework/Kolab_Session/test/Horde/Kolab/Session/phpunit.xml      |    2 +-
 .../Kolab_Storage/locale/ja/LC_MESSAGES/Horde_Kolab_Storage.mo    |  Bin 6929 -> 6929 bytes
 .../Kolab_Storage/locale/ja/LC_MESSAGES/Horde_Kolab_Storage.po    |   14 +-
 framework/Kolab_Storage/test/Horde/Kolab/Storage/AllTests.php     |   86 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/AttachmentTest.php     |    5 -
 framework/Kolab_Storage/test/Horde/Kolab/Storage/Autoload.php     |    5 -
 .../Storage/ComponentTest/Data/Object/Message/ModifiedTest.php    |    5 -
 .../Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php   |    7 +-
 .../test/Horde/Kolab/Storage/ComponentTest/List/CacheTest.php     |    5 -
 .../Horde/Kolab/Storage/ComponentTest/List/Query/Acl/BaseTest.php |    7 +-
 .../Kolab/Storage/ComponentTest/List/Query/List/BaseTest.php      |    5 -
 .../Kolab/Storage/ComponentTest/List/Query/List/CacheTest.php     |    5 -
 .../Kolab_Storage/test/Horde/Kolab/Storage/Server/DriverTest.php  |    7 +-
 .../test/Horde/Kolab/Storage/Unit/Cache/DataTest.php              |    5 -
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/CacheTest.php     |    5 -
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/CachedTest.php    |    5 -
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/Data/BaseTest.php |    5 -
 .../test/Horde/Kolab/Storage/Unit/Data/CachedTest.php             |    5 -
 .../test/Horde/Kolab/Storage/Unit/Data/Decorator/LogTest.php      |    5 -
 .../test/Horde/Kolab/Storage/Unit/Data/Query/History/BaseTest.php |    7 +-
 .../Horde/Kolab/Storage/Unit/Data/Query/Preferences/BaseTest.php  |    7 +-
 .../Horde/Kolab/Storage/Unit/Data/Query/Preferences/CacheTest.php |    7 +-
 .../test/Horde/Kolab/Storage/Unit/Decorator/LogTest.php           |    5 -
 .../Horde/Kolab/Storage/Unit/Decorator/SynchronizationTest.php    |    5 -
 .../test/Horde/Kolab/Storage/Unit/Driver/CclientTest.php          |    5 -
 .../test/Horde/Kolab/Storage/Unit/Driver/Decorator/LogTest.php    |    5 -
 .../test/Horde/Kolab/Storage/Unit/Driver/Decorator/TimerTest.php  |    5 -
 .../test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php             |    5 -
 .../test/Horde/Kolab/Storage/Unit/Driver/MockTest.php             |    5 -
 .../test/Horde/Kolab/Storage/Unit/Driver/PearTest.php             |    5 -
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/FactoryTest.php   |    5 -
 .../test/Horde/Kolab/Storage/Unit/Folder/BaseTest.php             |    5 -
 .../test/Horde/Kolab/Storage/Unit/Folder/DataTest.php             |    5 -
 .../test/Horde/Kolab/Storage/Unit/Folder/NamespaceTest.php        |    7 +-
 .../test/Horde/Kolab/Storage/Unit/Folder/Stamp/UidsTest.php       |    5 -
 .../test/Horde/Kolab/Storage/Unit/Folder/TypeTest.php             |    5 -
 .../test/Horde/Kolab/Storage/Unit/Folder/TypesTest.php            |    5 -
 .../test/Horde/Kolab/Storage/Unit/List/Manipulation/BaseTest.php  |    7 +-
 .../Kolab/Storage/Unit/List/Manipulation/Decorator/LogTest.php    |    7 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/Acl/BaseTest.php     |    7 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/Acl/CacheTest.php    |    7 +-
 .../Horde/Kolab/Storage/Unit/List/Query/ActiveSync/BaseTest.php   |    7 +-
 .../Horde/Kolab/Storage/Unit/List/Query/ActiveSync/CacheTest.php  |    7 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/List/BaseTest.php    |    5 -
 .../Storage/Unit/List/Query/List/Cache/SynchronizationTest.php    |    5 -
 .../test/Horde/Kolab/Storage/Unit/List/Query/List/CacheTest.php   |    5 -
 .../Horde/Kolab/Storage/Unit/List/Query/List/DefaultsTest.php     |    9 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/Share/BaseTest.php   |    7 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/Share/CacheTest.php  |    7 +-
 .../Horde/Kolab/Storage/Unit/List/Synchronization/BaseTest.php    |    7 +-
 .../Kolab/Storage/Unit/List/Synchronization/Decorator/LogTest.php |    7 +-
 .../test/Horde/Kolab/Storage/Unit/List/ToolsTest.php              |    7 +-
 .../test/Horde/Kolab/Storage/Unit/Object/MimeTypeTest.php         |    7 +-
 .../test/Horde/Kolab/Storage/Unit/Object/Writer/FormatTest.php    |    7 +-
 .../test/Horde/Kolab/Storage/Unit/Object/Writer/RawTest.php       |    7 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/ObjectTest.php    |    7 +-
 .../test/Horde/Kolab/Storage/Unit/QuerySet/UncachedTest.php       |    5 -
 .../test/Horde/Kolab/Storage/Unit/SynchronizationTest.php         |    5 -
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/UncachedTest.php  |    5 -
 framework/Kolab_Storage/test/Horde/Kolab/Storage/bootstrap.php    |    3 +
 framework/Kolab_Storage/test/Horde/Kolab/Storage/phpunit.xml      |    2 +-
 framework/Ldap/test/Horde/Ldap/AllTests.php                       |   36 +-
 framework/Ldap/test/Horde/Ldap/UtilTest.php                       |    5 -
 framework/Ldap/test/Horde/Ldap/bootstrap.php                      |    3 +
 framework/Ldap/test/Horde/Ldap/phpunit.xml                        |    1 +
 framework/ListHeaders/test/Horde/ListHeaders/AllTests.php         |   35 +-
 framework/ListHeaders/test/Horde/ListHeaders/bootstrap.php        |    3 +
 framework/ListHeaders/test/Horde/ListHeaders/phpunit.xml          |    1 +
 framework/Log/test/Horde/Log/AllTests.php                         |   41 +-
 framework/Log/test/Horde/Log/bootstrap.php                        |    3 +
 framework/Log/test/Horde/Log/phpunit.xml                          |    1 +
 framework/LoginTasks/test/Horde/LoginTasks/AllTests.php           |   35 +-
 framework/LoginTasks/test/Horde/LoginTasks/Autoload.php           |    5 -
 framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php     |    5 -
 framework/LoginTasks/test/Horde/LoginTasks/bootstrap.php          |    3 +
 framework/LoginTasks/test/Horde/LoginTasks/phpunit.xml            |    2 +-
 framework/Mail/test/Horde/Mail/AllTests.php                       |   35 +-
 framework/Mail/test/Horde/Mail/bootstrap.php                      |    3 +
 framework/Mail/test/Horde/Mail/phpunit.xml                        |    1 +
 framework/Mime/lib/Horde/Mime/mime.mapping.php                    |    2 +-
 framework/Mime/test/Horde/Mime/AllTests.php                       |   35 +-
 framework/Mime/test/Horde/Mime/HeadersTest.php                    |    5 -
 framework/Mime/test/Horde/Mime/MagicTest.php                      |    5 -
 framework/Mime/test/Horde/Mime/MailTest.php                       |    5 -
 framework/Mime/test/Horde/Mime/MimeTest.php                       |    5 -
 framework/Mime/test/Horde/Mime/PartTest.php                       |    5 -
 framework/Mime/test/Horde/Mime/RelatedTest.php                    |    5 -
 framework/Mime/test/Horde/Mime/bootstrap.php                      |    3 +
 framework/Mime/test/Horde/Mime/phpunit.xml                        |    1 +
 framework/Notification/test/Horde/Notification/AllTests.php       |   35 +-
 framework/Notification/test/Horde/Notification/Autoload.php       |    5 -
 .../Horde/Notification/Class/Notification/Event/StatusTest.php    |    5 -
 .../test/Horde/Notification/Class/Notification/EventTest.php      |    5 -
 .../Class/Notification/Handler/Decorator/AlarmTest.php            |    5 -
 .../Class/Notification/Handler/Decorator/HordelogTest.php         |    5 -
 .../Notification/Class/Notification/Handler/Decorator/LogTest.php |    5 -
 .../test/Horde/Notification/Class/Notification/HandlerTest.php    |    5 -
 .../Horde/Notification/Class/Notification/Listener/AudioTest.php  |    5 -
 .../Horde/Notification/Class/Notification/Listener/StatusTest.php |    5 -
 .../test/Horde/Notification/Class/Notification/ListenerTest.php   |    5 -
 .../test/Horde/Notification/Class/NotificationTest.php            |    5 -
 framework/Notification/test/Horde/Notification/bootstrap.php      |    3 +
 framework/Notification/test/Horde/Notification/phpunit.xml        |    2 +-
 framework/Pdf/test/Horde/Pdf/AllTests.php                         |   34 +-
 framework/Pdf/test/Horde/Pdf/bootstrap.php                        |    3 +
 framework/Pdf/test/Horde/Pdf/phpunit.xml                          |    1 +
 framework/Pear/test/Horde/Pear/AllTests.php                       |   44 +-
 framework/Pear/test/Horde/Pear/Autoload.php                       |    5 -
 framework/Pear/test/Horde/Pear/Server/RegistryTest.php            |    5 -
 framework/Pear/test/Horde/Pear/Server/RemoteTest.php              |    5 -
 framework/Pear/test/Horde/Pear/Server/RestTest.php                |    5 -
 .../Horde/Pear/Unit/Package/Contents/Ignore/CompositeTest.php     |    5 -
 .../Pear/test/Horde/Pear/Unit/Package/Contents/Ignore/DotTest.php |    5 -
 .../Pear/test/Horde/Pear/Unit/Package/Contents/Ignore/GitTest.php |    5 -
 .../test/Horde/Pear/Unit/Package/Contents/Ignore/HiddenTest.php   |    5 -
 .../test/Horde/Pear/Unit/Package/Contents/Ignore/PatternsTest.php |    5 -
 .../test/Horde/Pear/Unit/Package/Contents/Ignore/SymlinkTest.php  |    5 -
 .../Pear/Unit/Package/Contents/InstallAs/HordeApplicationTest.php |    5 -
 .../test/Horde/Pear/Unit/Package/Contents/InstallAs/HordeTest.php |    5 -
 framework/Pear/test/Horde/Pear/Unit/Package/Contents/ListTest.php |    5 -
 framework/Pear/test/Horde/Pear/Unit/Package/DependenciesTest.php  |    7 +-
 framework/Pear/test/Horde/Pear/Unit/Package/Type/HordeTest.php    |    5 -
 framework/Pear/test/Horde/Pear/Unit/Package/Xml/DirectoryTest.php |    5 -
 framework/Pear/test/Horde/Pear/Unit/Package/XmlTest.php           |    5 -
 framework/Pear/test/Horde/Pear/Unit/RegistryTest.php              |    5 -
 framework/Pear/test/Horde/Pear/Unit/RemoteTest.php                |    5 -
 framework/Pear/test/Horde/Pear/Unit/Rest/AccessTest.php           |    5 -
 framework/Pear/test/Horde/Pear/Unit/Rest/DependenciesTest.php     |    5 -
 framework/Pear/test/Horde/Pear/Unit/Rest/PackageListTest.php      |    5 -
 framework/Pear/test/Horde/Pear/Unit/Rest/PackageTest.php          |    5 -
 framework/Pear/test/Horde/Pear/Unit/Rest/ReleaseTest.php          |    5 -
 framework/Pear/test/Horde/Pear/Unit/Rest/ReleasesTest.php         |    5 -
 framework/Pear/test/Horde/Pear/Unit/RestTest.php                  |    5 -
 framework/Pear/test/Horde/Pear/bootstrap.php                      |    3 +
 framework/Pear/test/Horde/Pear/phpunit.xml                        |    2 +-
 framework/Perms/test/Horde/Perms/AllTests.php                     |   42 +-
 framework/Perms/test/Horde/Perms/KolabTest.php                    |    5 -
 framework/Perms/test/Horde/Perms/bootstrap.php                    |    3 +
 framework/Perms/test/Horde/Perms/phpunit.xml                      |    2 +-
 framework/Prefs/test/Horde/Prefs/AllTests.php                     |   49 +-
 framework/Prefs/test/Horde/Prefs/Autoload.php                     |    5 -
 framework/Prefs/test/Horde/Prefs/Unit/Storage/FileTest.php        |    7 +-
 .../Prefs/test/Horde/Prefs/Unit/Storage/KolabImapLogTest.php      |    7 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/KolabImapTest.php   |    7 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php        |    7 +-
 framework/Prefs/test/Horde/Prefs/bootstrap.php                    |    3 +
 framework/Prefs/test/Horde/Prefs/phpunit.xml                      |    2 +-
 framework/PubSub/test/Horde/PubSub/AllTests.php                   |   35 +-
 framework/PubSub/test/Horde/PubSub/bootstrap.php                  |    3 +
 framework/PubSub/test/Horde/PubSub/phpunit.xml                    |    1 +
 framework/Push/test/Horde/Push/AllTests.php                       |   49 +-
 framework/Push/test/Horde/Push/Autoload.php                       |    5 -
 framework/Push/test/Horde/Push/Unit/Push/CliTest.php              |    5 -
 framework/Push/test/Horde/Push/Unit/Push/Factory/PushTest.php     |    5 -
 .../Push/test/Horde/Push/Unit/Push/Factory/RecipientTest.php      |    5 -
 .../Push/test/Horde/Push/Unit/Push/Recipient/BloggerTest.php      |    5 -
 framework/Push/test/Horde/Push/Unit/Push/Recipient/MailTest.php   |    5 -
 .../Push/test/Horde/Push/Unit/Push/Recipient/TwitterTest.php      |    5 -
 framework/Push/test/Horde/Push/Unit/PushTest.php                  |    5 -
 framework/Push/test/Horde/Push/bootstrap.php                      |    3 +
 framework/Push/test/Horde/Push/phpunit.xml                        |    2 +-
 framework/Rdo/test/Horde/Rdo/AllTests.php                         |   30 +-
 framework/Rdo/test/Horde/Rdo/Autoload.php                         |    5 -
 framework/Rdo/test/Horde/Rdo/Base.php                             |    7 +-
 framework/Rdo/test/Horde/Rdo/bootstrap.php                        |    3 +
 framework/Rdo/test/Horde/Rdo/phpunit.xml                          |    2 +-
 framework/Release/test/Horde/Release/AllTests.php                 |   44 +-
 framework/Release/test/Horde/Release/Autoload.php                 |    5 -
 .../Release/test/Horde/Release/Unit/Release/SentinelTest.php      |    5 -
 framework/Release/test/Horde/Release/Unit/Release/WhupsTest.php   |    5 -
 framework/Release/test/Horde/Release/Unit/ReleaseTest.php         |    5 -
 framework/Release/test/Horde/Release/bootstrap.php                |    3 +
 framework/Release/test/Horde/Release/phpunit.xml                  |    2 +-
 framework/Routes/test/Horde/Routes/AllTests.php                   |   38 +-
 framework/Routes/test/Horde/Routes/bootstrap.php                  |    3 +
 framework/Routes/test/Horde/Routes/phpunit.xml                    |    1 +
 framework/Secret/test/Horde/Secret/AllTests.php                   |   38 +-
 framework/Secret/test/Horde/Secret/Autoload.php                   |    7 +-
 framework/Secret/test/Horde/Secret/Unit/SecretTest.php            |    9 +-
 framework/Secret/test/Horde/Secret/bootstrap.php                  |    3 +
 framework/Secret/test/Horde/Secret/phpunit.xml                    |    2 +-
 framework/Serialize/test/Horde/Serialize/AllTests.php             |   37 +-
 framework/Serialize/test/Horde/Serialize/bootstrap.php            |    3 +
 framework/Serialize/test/Horde/Serialize/phpunit.xml              |    1 +
 .../Service_Gravatar/test/Horde/Service/Gravatar/AllTests.php     |   44 +-
 .../Service_Gravatar/test/Horde/Service/Gravatar/GravatarTest.php |    4 +-
 .../Service_Gravatar/test/Horde/Service/Gravatar/ServerTest.php   |    4 +-
 .../Service_Gravatar/test/Horde/Service/Gravatar/bootstrap.php    |    3 +
 .../Service_Gravatar/test/Horde/Service/Gravatar/phpunit.xml      |    1 +
 .../locale/ja/LC_MESSAGES/Horde_Service_Weather.mo                |  Bin 10067 -> 9887 bytes
 .../locale/ja/LC_MESSAGES/Horde_Service_Weather.po                |    9 +-
 framework/Service_Weather/test/Horde/Service/Weather/AllTests.php |   44 +-
 .../Service_Weather/test/Horde/Service/Weather/GoogleTest.php     |    5 +-
 .../test/Horde/Service/Weather/WundergroundTest.php               |    5 +-
 framework/Service_Weather/test/Horde/Service/Weather/WwoTest.php  |    5 +-
 .../Service_Weather/test/Horde/Service/Weather/bootstrap.php      |    3 +
 framework/Service_Weather/test/Horde/Service/Weather/phpunit.xml  |    1 +
 framework/SessionHandler/test/Horde/SessionHandler/AllTests.php   |   35 +-
 .../SessionHandler/test/Horde/SessionHandler/Storage/Base.php     |    5 -
 framework/SessionHandler/test/Horde/SessionHandler/bootstrap.php  |    3 +
 framework/SessionHandler/test/Horde/SessionHandler/phpunit.xml    |    1 +
 framework/Share/test/Horde/Share/AllTests.php                     |   34 +-
 framework/Share/test/Horde/Share/Autoload.php                     |    5 -
 framework/Share/test/Horde/Share/Base.php                         |    7 +-
 framework/Share/test/Horde/Share/Kolab/UnitTest.php               |    7 +-
 framework/Share/test/Horde/Share/bootstrap.php                    |    3 +
 framework/Share/test/Horde/Share/phpunit.xml                      |    2 +-
 framework/Stream/test/Horde/Stream/AllTests.php                   |   33 +-
 framework/Stream/test/Horde/Stream/bootstrap.php                  |    3 +
 framework/Stream/test/Horde/Stream/phpunit.xml                    |    1 +
 framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php     |   33 +-
 framework/Stream_Filter/test/Horde/Stream/Filter/bootstrap.php    |    3 +
 framework/Stream_Filter/test/Horde/Stream/Filter/phpunit.xml      |    1 +
 framework/Support/lib/Horde/Support/Randomid.php                  |   25 +-
 framework/Support/package.xml                                     |    4 +-
 framework/Support/test/Horde/Support/AllTests.php                 |   35 +-
 framework/Support/test/Horde/Support/ArrayTest.php                |    5 -
 framework/Support/test/Horde/Support/BacktraceTest.php            |    5 -
 framework/Support/test/Horde/Support/CombineStreamTest.php        |    5 -
 framework/Support/test/Horde/Support/ConsistentHashTest.php       |    5 -
 framework/Support/test/Horde/Support/GuidTest.php                 |    5 -
 framework/Support/test/Horde/Support/InflectorTest.php            |    5 -
 framework/Support/test/Horde/Support/MemoryTest.php               |    5 -
 framework/Support/test/Horde/Support/ObjectStubTest.php           |    5 -
 framework/Support/test/Horde/Support/RandomidTest.php             |    5 -
 framework/Support/test/Horde/Support/StackTest.php                |    7 +-
 framework/Support/test/Horde/Support/StringStreamTest.php         |    5 -
 framework/Support/test/Horde/Support/StubTest.php                 |    5 -
 framework/Support/test/Horde/Support/TimerTest.php                |    5 -
 framework/Support/test/Horde/Support/UuidTest.php                 |    5 -
 framework/Support/test/Horde/Support/bootstrap.php                |    3 +
 framework/Support/test/Horde/Support/phpunit.xml                  |    1 +
 framework/Template/test/Horde/Template/AllTests.php               |   37 +-
 framework/Template/test/Horde/Template/TemplateTest.php           |    3 -
 framework/Template/test/Horde/Template/bootstrap.php              |    3 +
 framework/Template/test/Horde/Template/phpunit.xml                |    1 +
 framework/Test/doc/Horde/Test/template/packagetest/AllTests.php   |    3 +
 framework/Test/doc/Horde/Test/template/packagetest/bootstrap.php  |    3 +
 framework/Test/doc/Horde/Test/template/packagetest/phpunit.xml    |    1 +
 framework/Test/lib/Horde/Test/AllTests.php                        |   97 +-
 framework/Test/lib/Horde/Test/Autoload.php                        |   98 +-
 framework/Test/lib/Horde/Test/Bootstrap.php                       |   55 +
 framework/Test/package.xml                                        |   22 +-
 framework/Text_Diff/test/Horde/Text/Diff/AllTests.php             |   35 +-
 framework/Text_Diff/test/Horde/Text/Diff/EngineTest.php           |    5 -
 framework/Text_Diff/test/Horde/Text/Diff/RendererTest.php         |    5 -
 framework/Text_Diff/test/Horde/Text/Diff/ThreeWayTest.php         |    5 -
 framework/Text_Diff/test/Horde/Text/Diff/bootstrap.php            |    3 +
 framework/Text_Diff/test/Horde/Text/Diff/phpunit.xml              |    1 +
 .../Text_Filter/lib/Horde/Text/Filter/JavascriptMinify/JsMin.php  |    2 +-
 framework/Text_Filter/package.xml                                 |    4 +-
 framework/Text_Filter/test/Horde/Text/Filter/AllTests.php         |   37 +-
 framework/Text_Filter/test/Horde/Text/Filter/LinkurlsTest.php     |    2 -
 framework/Text_Filter/test/Horde/Text/Filter/bootstrap.php        |    3 +
 framework/Text_Filter/test/Horde/Text/Filter/phpunit.xml          |    2 +-
 .../test/Horde/Text/Filter/Csstidy/AllTests.php                   |   37 +-
 .../test/Horde/Text/Filter/Csstidy/bootstrap.php                  |    3 +
 .../test/Horde/Text/Filter/Csstidy/phpunit.xml                    |    2 +-
 framework/Text_Flowed/test/Horde/Text/Flowed/AllTests.php         |   37 +-
 framework/Text_Flowed/test/Horde/Text/Flowed/bootstrap.php        |    3 +
 framework/Text_Flowed/test/Horde/Text/Flowed/phpunit.xml          |    2 +-
 framework/Text_Textile/test/Horde/Text/Textile/AllTests.php       |   31 +-
 framework/Text_Textile/test/Horde/Text/Textile/bootstrap.php      |    3 +
 framework/Text_Textile/test/Horde/Text/Textile/phpunit.xml        |    1 +
 framework/Timezone/test/Horde/Timezone/AllTests.php               |   35 +-
 framework/Timezone/test/Horde/Timezone/IcalendarTest.php          |    5 -
 framework/Timezone/test/Horde/Timezone/bootstrap.php              |    3 +
 framework/Timezone/test/Horde/Timezone/phpunit.xml                |    1 +
 framework/Token/test/Horde/Token/AllTests.php                     |   49 +-
 framework/Token/test/Horde/Token/Autoload.php                     |    5 -
 framework/Token/test/Horde/Token/Unit/FileTest.php                |    7 +-
 framework/Token/test/Horde/Token/Unit/SqlTest.php                 |    7 +-
 framework/Token/test/Horde/Token/bootstrap.php                    |    3 +
 framework/Token/test/Horde/Token/phpunit.xml                      |    2 +-
 framework/Translation/test/Horde/Translation/AllTests.php         |   35 +-
 framework/Translation/test/Horde/Translation/bootstrap.php        |    3 +
 framework/Translation/test/Horde/Translation/phpunit.xml          |    1 +
 framework/Url/test/Horde/Url/AllTests.php                         |   35 +-
 framework/Url/test/Horde/Url/bootstrap.php                        |    3 +
 framework/Url/test/Horde/Url/phpunit.xml                          |    1 +
 framework/Util/test/Horde/Util/AllTests.php                       |   35 +-
 framework/Util/test/Horde/Util/ArrayTest.php                      |    5 -
 framework/Util/test/Horde/Util/DomhtmlTest.php                    |    5 -
 framework/Util/test/Horde/Util/StringTest.php                     |    5 -
 framework/Util/test/Horde/Util/UtilTest.php                       |    5 -
 framework/Util/test/Horde/Util/bootstrap.php                      |    3 +
 framework/Util/test/Horde/Util/phpunit.xml                        |    1 +
 framework/Vcs/test/Horde/Vcs/AllTests.php                         |   35 +-
 framework/Vcs/test/Horde/Vcs/TestBase.php                         |    5 -
 framework/Vcs/test/Horde/Vcs/bootstrap.php                        |    3 +
 framework/Vcs/test/Horde/Vcs/phpunit.xml                          |    1 +
 framework/Vfs/test/Horde/Vfs/AllTests.php                         |   38 +-
 framework/Vfs/test/Horde/Vfs/Base.php                             |    7 +-
 framework/Vfs/test/Horde/Vfs/bootstrap.php                        |    3 +
 framework/Vfs/test/Horde/Vfs/phpunit.xml                          |    1 +
 framework/View/test/Horde/View/AllTests.php                       |   37 +-
 framework/View/test/Horde/View/bootstrap.php                      |    3 +
 framework/View/test/Horde/View/phpunit.xml                        |    2 +-
 framework/Xml_Element/test/Horde/Xml/Element/AllTests.php         |   27 +-
 framework/Xml_Element/test/Horde/Xml/Element/CountTest.php        |    3 -
 framework/Xml_Element/test/Horde/Xml/Element/ElementTest.php      |    2 -
 framework/Xml_Element/test/Horde/Xml/Element/IteratorTest.php     |    3 -
 framework/Xml_Element/test/Horde/Xml/Element/bootstrap.php        |    3 +
 framework/Xml_Element/test/Horde/Xml/Element/phpunit.xml          |    1 +
 framework/Xml_Wbxml/test/Horde/Xml/Wbxml/AllTests.php             |   35 +-
 framework/Xml_Wbxml/test/Horde/Xml/Wbxml/DecodeTest.php           |    5 -
 framework/Xml_Wbxml/test/Horde/Xml/Wbxml/bootstrap.php            |    3 +
 framework/Xml_Wbxml/test/Horde/Xml/Wbxml/phpunit.xml              |    1 +
 framework/Yaml/test/Horde/Yaml/AllTests.php                       |   35 +-
 framework/Yaml/test/Horde/Yaml/Autoload.php                       |    4 -
 framework/Yaml/test/Horde/Yaml/LoaderTest.php                     |    2 -
 framework/Yaml/test/Horde/Yaml/bootstrap.php                      |    3 +
 framework/Yaml/test/Horde/Yaml/phpunit.xml                        |    1 +
 gollem/clipboard.php                                              |    1 -
 gollem/js/clipboard.js                                            |    2 +-
 gollem/js/manager.js                                              |  106 +-
 gollem/lib/Application.php                                        |   60 +-
 gollem/lib/Gollem.php                                             |   50 -
 gollem/locale/de/LC_MESSAGES/gollem.mo                            |  Bin 73932 -> 73933 bytes
 gollem/locale/de/LC_MESSAGES/gollem.po                            |    4 +-
 gollem/manager.php                                                |   36 +-
 gollem/quota.php                                                  |    1 -
 gollem/templates/manager.html.php                                 |   41 +-
 gollem/templates/menu.html                                        |   35 -
 gollem/themes/default/graphics/perms_disabled.png                 |  Bin 243 -> 489 bytes
 gollem/themes/default/screen.css                                  |   17 +-
 hermes/bin/.htaccess                                              |    1 +
 hermes/bin/hermes-purge                                           |   23 +
 hermes/lib/Application.php                                        |    8 +-
 hermes/package.xml                                                |   86 +-
 hermes/scripts/.htaccess                                          |    1 -
 hermes/scripts/Sandals.wdgt/Default.png                           |  Bin 142 -> 0 bytes
 hermes/scripts/Sandals.wdgt/Icon.png                              |  Bin 4436 -> 0 bytes
 hermes/scripts/Sandals.wdgt/Info.plist                            |   30 -
 .../Sandals.wdgt/KeychainPlugIn.widgetplugin/Contents/Info.plist  |   22 -
 .../KeychainPlugIn.widgetplugin/Contents/MacOS/KeychainPlugIn     |  Bin 46724 -> 0 bytes
 .../Contents/Resources/English.lproj/InfoPlist.strings            |  Bin 276 -> 0 bytes
 hermes/scripts/Sandals.wdgt/Sandals.html                          |  436 --
 hermes/scripts/Sandals.wdgt/lib/Sandals.js                        |  793 ----
 hermes/scripts/Sandals.wdgt/lib/horde.js                          |  265 --
 hermes/scripts/Sandals.wdgt/lib/open_calendar.js                  |  480 --
 hermes/scripts/Sandals.wdgt/lib/stripe.js                         |   95 -
 hermes/scripts/Sandals.wdgt/lib/vcXMLRPC.js                       |  639 ---
 hermes/scripts/Sandals.wdgt/themes/bluewhite-screen.css           |  160 -
 hermes/scripts/Sandals.wdgt/themes/graphics/alerts/alarm.png      |  Bin 422 -> 0 bytes
 hermes/scripts/Sandals.wdgt/themes/graphics/alerts/error.png      |  Bin 184 -> 0 bytes
 hermes/scripts/Sandals.wdgt/themes/graphics/alerts/message.png    |  Bin 365 -> 0 bytes
 hermes/scripts/Sandals.wdgt/themes/graphics/alerts/success.png    |  Bin 336 -> 0 bytes
 hermes/scripts/Sandals.wdgt/themes/graphics/alerts/warning.png    |  Bin 169 -> 0 bytes
 hermes/scripts/Sandals.wdgt/themes/graphics/calendar.png          |  Bin 320 -> 0 bytes
 hermes/scripts/Sandals.wdgt/themes/graphics/hermes.png            |  Bin 473 -> 0 bytes
 hermes/scripts/Sandals.wdgt/themes/graphics/required.png          |  Bin 118 -> 0 bytes
 .../scripts/Sandals.wdgt/themes/graphics/spinner-transparent.gif  |  Bin 1849 -> 0 bytes
 hermes/scripts/Sandals.wdgt/themes/hermes-screen.css              |   36 -
 hermes/scripts/Sandals.wdgt/themes/sandals-screen.css             |    5 -
 hermes/scripts/Sandals.wdgt/themes/screen.css                     |  796 ----
 hermes/scripts/purge.php                                          |   16 -
 hermes/themes/default/graphics/admin.png                          |  Bin 667 -> 667 bytes
 hermes/themes/default/graphics/deliverable.png                    |  Bin 625 -> 772 bytes
 hermes/themes/default/graphics/timer-start.png                    |  Bin 469 -> 680 bytes
 hermes/themes/default/graphics/timer-stop.png                     |  Bin 521 -> 682 bytes
 hermes/themes/default/screen.css                                  |    6 +
 horde/config/registry.php                                         |   46 +-
 horde/docs/INSTALL                                                |    9 +-
 horde/locale/ja/LC_MESSAGES/horde.mo                              |  Bin 67722 -> 67724 bytes
 horde/locale/ja/LC_MESSAGES/horde.po                              |   82 +-
 imp/docs/CHANGES                                                  |    1 +
 imp/lib/Compose.php                                               |    1 +
 imp/lib/Mbox/Parse.php                                            |    5 +-
 imp/locale/de/LC_MESSAGES/imp.mo                                  |  Bin 181624 -> 181625 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                  |    4 +-
 imp/locale/ja/LC_MESSAGES/imp.mo                                  |  Bin 188657 -> 188679 bytes
 imp/locale/ja/LC_MESSAGES/imp.po                                  |  980 +++--
 imp/package.xml                                                   |    1 +
 imp/test/Imp/AllTests.php                                         |   44 +-
 imp/test/Imp/Autoload.php                                         |    7 +-
 imp/test/Imp/Unit/ComposeTest.php                                 |    5 -
 imp/test/Imp/Unit/MboxParseTest.php                               |   13 +-
 imp/test/Imp/Unit/Mime/Viewer/HtmlTest.php                        |    6 -
 imp/test/Imp/Unit/Mime/Viewer/ItipTest.php                        |    7 -
 imp/test/Imp/Unit/QuotaTest.php                                   |    5 -
 imp/test/Imp/bootstrap.php                                        |    3 +
 imp/test/Imp/phpunit.xml                                          |    2 +-
 ingo/locale/ja/LC_MESSAGES/ingo.mo                                |  Bin 88287 -> 88235 bytes
 ingo/locale/ja/LC_MESSAGES/ingo.po                                |   68 +-
 kronolith/locale/ja/LC_MESSAGES/kronolith.mo                      |  Bin 130226 -> 130122 bytes
 kronolith/locale/ja/LC_MESSAGES/kronolith.po                      |   18 +-
 mnemo/locale/ja/LC_MESSAGES/mnemo.mo                              |  Bin 77857 -> 77711 bytes
 mnemo/locale/ja/LC_MESSAGES/mnemo.po                              |   18 +-
 nag/docs/CHANGES                                                  |    1 +
 nag/lib/Task.php                                                  |    5 +-
 nag/locale/ja/LC_MESSAGES/nag.mo                                  |  Bin 94180 -> 94033 bytes
 nag/locale/ja/LC_MESSAGES/nag.po                                  |   21 +-
 nag/package.xml                                                   |    9 +
 passwd/bin/.htaccess                                              |    1 +
 passwd/bin/passwd-expect                                          |  267 ++
 passwd/bin/passwd-expect-kerberos                                 |   58 +
 passwd/package.xml                                                |   18 +-
 passwd/scripts/.htaccess                                          |    1 -
 passwd/scripts/passwd-expect                                      |  267 --
 passwd/scripts/passwd-expect-kerberos                             |   58 -
 turba/docs/CHANGES                                                |    2 +
 turba/lib/Driver.php                                              |    2 +-
 turba/locale/ja/LC_MESSAGES/turba.mo                              |  Bin 100626 -> 100513 bytes
 turba/locale/ja/LC_MESSAGES/turba.po                              |   62 +-
 turba/package.xml                                                 |    2 +
 662 files changed, 2305 insertions(+), 10099 deletions(-)

http://git.horde.org/horde-git/-/commit/a15a3e87fb7570a6fc141d50e7893a530c34e2f8

-----------------------------------------------------------------------

commit 333f3312e724283243a4e5ed44499c50b3a160e3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Nov 12 23:24:23 2012 -0700

    Hidden session ID data no longer needed.
    
    Session data is available either as part of form URL or in cookie.

 imp/compose.php                                  |    1 -
 imp/contacts.php                                 |    1 -
 imp/lib/Crypt/Pgp.php                            |    1 -
 imp/lib/Crypt/Smime.php                          |    1 -
 imp/mailbox.php                                  |    2 --
 imp/message.php                                  |    1 -
 imp/search-basic.php                             |    1 -
 imp/templates/basic/compose/compose.html.php     |    1 -
 imp/templates/basic/mailbox/form_start.html.php  |    1 -
 imp/templates/basic/mailbox/navbar.html.php      |    1 -
 imp/templates/basic/message/navbar_top.html.php  |    1 -
 imp/templates/basic/search/search-basic.html.php |    1 -
 imp/templates/contacts/contacts.html.php         |    1 -
 imp/templates/pgp/import_key.html.php            |    1 -
 imp/templates/smime/import_key.html.php          |    1 -
 15 files changed, 0 insertions(+), 16 deletions(-)

http://git.horde.org/horde-git/-/commit/333f3312e724283243a4e5ed44499c50b3a160e3

-----------------------------------------------------------------------

commit 45c0659206521c4ca067ac08f2f4a8061be26c7c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Nov 12 23:44:48 2012 -0700

    [mms] All Ingo templates now use Horde_View.

 ingo/blacklist.php                                |   25 +++-
 ingo/docs/CHANGES                                 |    1 +
 ingo/filters.php                                  |   80 ++++-----
 ingo/js/blacklist.js                              |   24 ++-
 ingo/js/filters.js                                |   11 ++
 ingo/js/rule.js                                   |   26 +++
 ingo/js/whitelist.js                              |   11 ++
 ingo/lib/Ingo.php                                 |   18 ++-
 ingo/package.xml                                  |   11 +-
 ingo/rule.php                                     |  190 ++++++++------------
 ingo/script.php                                   |   30 ++--
 ingo/templates/basic/blacklist/blacklist.html.php |   57 ++++++
 ingo/templates/basic/filters/filters.html.php     |  114 ++++++++++++
 ingo/templates/basic/menu/menu.html.php           |   13 ++
 ingo/templates/basic/rule/rule.html.php           |  200 +++++++++++++++++++++
 ingo/templates/basic/script/script.html.php       |   55 ++++++
 ingo/templates/basic/whitelist/whitelist.html.php |   33 ++++
 ingo/templates/blacklist/blacklist.inc            |   53 ------
 ingo/templates/filters/filter-none.inc            |    5 -
 ingo/templates/filters/filter.html                |   33 ----
 ingo/templates/filters/footer.inc                 |    8 -
 ingo/templates/filters/header.inc                 |   20 --
 ingo/templates/filters/settings.inc               |   30 ---
 ingo/templates/menu/menu.html                     |   14 --
 ingo/templates/rule/filter.inc                    |   37 ----
 ingo/templates/rule/footer.inc                    |   69 -------
 ingo/templates/rule/header.inc                    |   47 -----
 ingo/templates/script/activate.inc                |   39 ----
 ingo/templates/script/footer.inc                  |    4 -
 ingo/templates/script/header.inc                  |    4 -
 ingo/templates/script/script.inc                  |    4 -
 ingo/templates/whitelist/whitelist.inc            |   34 ----
 ingo/whitelist.php                                |   22 ++-
 33 files changed, 731 insertions(+), 591 deletions(-)
 create mode 100644 ingo/js/whitelist.js
 create mode 100644 ingo/templates/basic/blacklist/blacklist.html.php
 create mode 100644 ingo/templates/basic/filters/filters.html.php
 create mode 100644 ingo/templates/basic/menu/menu.html.php
 create mode 100644 ingo/templates/basic/rule/rule.html.php
 create mode 100644 ingo/templates/basic/script/script.html.php
 create mode 100644 ingo/templates/basic/whitelist/whitelist.html.php
 delete mode 100644 ingo/templates/blacklist/blacklist.inc
 delete mode 100644 ingo/templates/filters/filter-none.inc
 delete mode 100644 ingo/templates/filters/filter.html
 delete mode 100644 ingo/templates/filters/footer.inc
 delete mode 100644 ingo/templates/filters/header.inc
 delete mode 100644 ingo/templates/filters/settings.inc
 delete mode 100644 ingo/templates/menu/menu.html
 delete mode 100644 ingo/templates/rule/filter.inc
 delete mode 100644 ingo/templates/rule/footer.inc
 delete mode 100644 ingo/templates/rule/header.inc
 delete mode 100644 ingo/templates/script/activate.inc
 delete mode 100644 ingo/templates/script/footer.inc
 delete mode 100644 ingo/templates/script/header.inc
 delete mode 100644 ingo/templates/script/script.inc
 delete mode 100644 ingo/templates/whitelist/whitelist.inc

http://git.horde.org/horde-git/-/commit/45c0659206521c4ca067ac08f2f4a8061be26c7c

-----------------------------------------------------------------------

commit ac9228b3f82a06fc5c29bf921f0327064ea07153
Merge: 45c0659 b93ad76
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 13 22:33:11 2012 -0700

    Merge branch 'master' into imp_6_1

 ansel/test/Ansel/AllTests.php                                     |   49 +--
 ansel/test/Ansel/Autoload.php                                     |    6 +-
 ansel/test/Ansel/Unit/Base.php                                    |    7 +-
 ansel/test/Ansel/Unit/ImageTest.php                               |    7 +-
 ansel/test/Ansel/bootstrap.php                                    |    3 +
 ansel/test/Ansel/phpunit.xml                                      |    2 +-
 components/test/Components/AllTests.php                           |   49 +--
 components/test/Components/Autoload.php                           |    5 -
 .../test/Components/Integration/Components/Module/CiSetupTest.php |    7 +-
 .../Components/Integration/Components/Module/DistributeTest.php   |    7 +-
 .../Components/Integration/Components/Module/DocumentTest.php     |    7 +-
 .../Components/Integration/Components/Module/InstallerTest.php    |    7 +-
 .../test/Components/Integration/Components/Module/ReleaseTest.php |    7 +-
 .../Components/Unit/Components/Component/DependencyListTest.php   |    7 +-
 .../test/Components/Unit/Components/Component/DependencyTest.php  |    5 -
 .../test/Components/Unit/Components/Component/IdentifyTest.php    |    7 +-
 .../test/Components/Unit/Components/Component/ResolverTest.php    |    5 -
 components/test/Components/Unit/Components/Config/FileTest.php    |    7 +-
 components/test/Components/Unit/Components/ConfigsTest.php        |    7 +-
 .../test/Components/Unit/Components/Helper/DocsOriginTest.php     |    7 +-
 components/test/Components/Unit/Components/Helper/RootTest.php    |    7 +-
 .../test/Components/Unit/Components/Helper/TemplatesTest.php      |    7 +-
 .../Components/Unit/Components/Helper/VersionDescriptionTest.php  |    7 +-
 .../Components/Unit/Components/Helper/VersionStabilityTest.php    |    7 +-
 components/test/Components/Unit/Components/Helper/VersionTest.php |    7 +-
 .../test/Components/Unit/Components/Module/DependenciesTest.php   |    7 +-
 .../test/Components/Unit/Components/Module/SnapshotTest.php       |    7 +-
 components/test/Components/Unit/Components/Module/UpdateTest.php  |    7 +-
 .../Unit/Components/Release/Task/CurrentSentinelTest.php          |    7 +-
 .../Components/Unit/Components/Release/Task/NextSentinelTest.php  |    5 -
 .../test/Components/Unit/Components/Release/Task/PackageTest.php  |    7 +-
 .../Components/Unit/Components/Release/Task/TimestampTest.php     |    7 +-
 components/test/Components/Unit/ComponentsTest.php                |    7 +-
 components/test/Components/bootstrap.php                          |    3 +
 components/test/Components/phpunit.xml                            |    2 +-
 content/docs/CHANGES                                              |    2 +
 content/lib/Indexer.php                                           |   12 +-
 content/package.xml                                               |   13 +-
 content/test/Content/AllTests.php                                 |   27 +-
 content/test/Content/Autoload.php                                 |    6 +-
 content/test/Content/Base.php                                     |    5 +-
 content/test/Content/bootstrap.php                                |    3 +
 content/test/Content/phpunit.xml                                  |    1 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Mailbox.php      |    5 -
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |    2 +-
 framework/Imap_Client/package.xml                                 |    2 +
 gollem/js/clipboard.js                                            |   16 +-
 gollem/js/edit.js                                                 |    2 +-
 gollem/js/manager.js                                              |   21 +-
 gollem/manager.php                                                |   29 +-
 gollem/package.xml                                                |    8 +-
 gollem/selectlist.php                                             |    4 +-
 gollem/templates/clipboard.html.php                               |   52 ++-
 gollem/templates/edit.html.php                                    |    5 +-
 gollem/templates/manager.html.php                                 |   28 +-
 gollem/themes/default/graphics/filter-topbar.png                  |  Bin 0 -> 390 bytes
 gollem/themes/default/screen.css                                  |   59 +--
 hermes/js/hermes.js                                               |    2 +-
 horde/docs/CHANGES                                                |    2 +
 horde/lib/Prefs/Special/Activesync.php                            |    1 -
 horde/lib/View/Topbar.php                                         |    2 +
 horde/package.xml                                                 |   14 +-
 horde/templates/admin/user/approve.inc                            |    8 +-
 horde/templates/admin/user/list.inc                               |    4 +-
 horde/templates/admin/user/remove.inc                             |    2 +
 horde/templates/prefs/activesync.html                             |   14 +-
 horde/templates/topbar/_menubar.html.php                          |    2 +-
 horde/themes/default/graphics/az.png                              |  Bin 117 -> 343 bytes
 horde/themes/default/graphics/filter-topbar.png                   |  Bin 0 -> 390 bytes
 horde/themes/default/graphics/za.png                              |  Bin 119 -> 338 bytes
 horde/themes/default/screen.css                                   |  106 +++--
 imp/lib/IMP.php                                                   |    2 +-
 imp/themes/default/basic/screen.css                               |    1 -
 imp/themes/default/screen.css                                     |    4 +-
 kolab/test/Kolab/AllTests.php                                     |   35 +--
 kolab/test/Kolab/Autoload.php                                     |   20 -
 kolab/test/Kolab/ExampleTest.php                                  |    5 -
 kolab/test/Kolab/bootstrap.php                                    |    3 +
 kolab/test/Kolab/phpunit.xml                                      |    1 +
 koward/test/Koward/AllTests.php                                   |   84 +----
 koward/test/Koward/Autoload.php                                   |    3 +
 koward/test/Koward/KowardTest.php                                 |    5 -
 koward/test/Koward/TestInit.php                                   |   24 -
 koward/test/Koward/bootstrap.php                                  |    3 +
 koward/test/Koward/phpunit.xml                                    |    1 +
 kronolith/lib/Ajax/Imple/TagAutoCompleter.php                     |    3 +-
 kronolith/test/Kronolith/AllTests.php                             |   44 +--
 kronolith/test/Kronolith/Autoload.php                             |    6 +-
 kronolith/test/Kronolith/Integration/AllDayTest.php               |    5 -
 kronolith/test/Kronolith/Integration/Driver/KolabTest.php         |    5 -
 .../test/Kronolith/Integration/Driver/Sql/Pdo/SqliteTest.php      |    7 +-
 kronolith/test/Kronolith/Integration/FromIcalendarTest.php        |    5 -
 kronolith/test/Kronolith/Integration/Kronolith/KolabTest.php      |    5 -
 .../test/Kronolith/Integration/Kronolith/Sql/Pdo/SqliteTest.php   |    7 +-
 kronolith/test/Kronolith/Integration/ToIcalendarTest.php          |    5 -
 kronolith/test/Kronolith/bootstrap.php                            |    3 +
 kronolith/test/Kronolith/phpunit.xml                              |    2 +-
 mnemo/test/Mnemo/AllTests.php                                     |   49 +--
 mnemo/test/Mnemo/Autoload.php                                     |    6 +-
 mnemo/test/Mnemo/Unit/Driver/KolabTest.php                        |    5 -
 mnemo/test/Mnemo/Unit/Factory/DriverTest.php                      |    5 -
 mnemo/test/Mnemo/Unit/Mnemo/KolabTest.php                         |    5 -
 mnemo/test/Mnemo/Unit/Mnemo/Sql/Pdo/SqliteTest.php                |    7 +-
 mnemo/test/Mnemo/bootstrap.php                                    |    3 +
 mnemo/test/Mnemo/phpunit.xml                                      |    2 +-
 nag/test/Nag/AllTests.php                                         |   44 +--
 nag/test/Nag/Autoload.php                                         |    6 +-
 nag/test/Nag/Unit/Driver/KolabTest.php                            |    5 -
 nag/test/Nag/Unit/Driver/Sql/Pdo/SqliteTest.php                   |    7 +-
 nag/test/Nag/Unit/Factory/TasklistsTest.php                       |    5 -
 nag/test/Nag/Unit/Form/Task/KolabTest.php                         |    5 -
 nag/test/Nag/Unit/Form/Task/Sql/Pdo/SqliteTest.php                |    7 +-
 nag/test/Nag/Unit/Nag/KolabTest.php                               |    5 -
 nag/test/Nag/Unit/Nag/Sql/Pdo/SqliteTest.php                      |    7 +-
 nag/test/Nag/bootstrap.php                                        |    3 +
 nag/test/Nag/phpunit.xml                                          |    2 +-
 passwd/test/Passwd/AllTests.php                                   |   35 +--
 passwd/test/Passwd/Autoload.php                                   |    8 +-
 passwd/test/Passwd/TestCase.php                                   |   10 +-
 passwd/test/Passwd/Unit/Driver/SqlTest.php                        |    9 +-
 passwd/test/Passwd/Unit/Factory/DriverTest.php                    |    8 +-
 passwd/test/Passwd/bootstrap.php                                  |    3 +
 passwd/test/Passwd/phpunit.xml                                    |    1 +
 sesha/test/Sesha/AllTests.php                                     |   35 +--
 sesha/test/Sesha/Autoload.php                                     |    8 +-
 sesha/test/Sesha/TestCase.php                                     |   10 +-
 sesha/test/Sesha/Unit/Driver/RdoTest.php                          |   10 +-
 sesha/test/Sesha/bootstrap.php                                    |    3 +
 sesha/test/Sesha/phpunit.xml                                      |    1 +
 skeleton/test/Skeleton/AllTests.php                               |   35 +--
 skeleton/test/Skeleton/Autoload.php                               |   20 -
 skeleton/test/Skeleton/ExampleTest.php                            |    5 -
 skeleton/test/Skeleton/bootstrap.php                              |    3 +
 skeleton/test/Skeleton/phpunit.xml                                |    1 +
 trean/LICENSE                                                     |   63 +--
 trean/README                                                      |    2 +-
 trean/add.php                                                     |    8 +-
 trean/favicon.php                                                 |    4 +-
 trean/index.php                                                   |    2 +-
 trean/lib/Ajax/Imple/TagAutoCompleter.php                         |   17 +-
 trean/lib/Application.php                                         |   21 +-
 trean/lib/Bookmarks.php                                           |   26 +-
 trean/lib/Form/Search.php                                         |   14 +
 trean/lib/Forms/Search.php                                        |   14 -
 trean/lib/TagBrowser.php                                          |    6 +-
 trean/lib/View/BookmarkList.php                                   |    3 +-
 trean/package.xml                                                 |   51 +--
 trean/search.php                                                  |   39 +-
 trean/templates/add.html.php                                      |    3 +-
 trean/templates/list.html.php                                     |   17 +-
 trean/themes/default/graphics/add.png                             |  Bin 364 -> 626 bytes
 trean/themes/default/graphics/az.png                              |  Bin 117 -> 0 bytes
 trean/themes/default/graphics/data.png                            |  Bin 583 -> 0 bytes
 trean/themes/default/graphics/delete.png                          |  Bin 414 -> 0 bytes
 trean/themes/default/graphics/edit.png                            |  Bin 439 -> 0 bytes
 trean/themes/default/graphics/favicon.ico                         |  Bin 1150 -> 1742 bytes
 trean/themes/default/graphics/folders/folder_create.png           |  Bin 233 -> 0 bytes
 trean/themes/default/graphics/folders/folder_delete.png           |  Bin 234 -> 0 bytes
 trean/themes/default/graphics/folders/folder_edit.png             |  Bin 164 -> 0 bytes
 trean/themes/default/graphics/http/1xx.png                        |  Bin 365 -> 610 bytes
 trean/themes/default/graphics/http/2xx.png                        |  Bin 336 -> 604 bytes
 trean/themes/default/graphics/http/3xx.png                        |  Bin 365 -> 610 bytes
 trean/themes/default/graphics/http/4xx.png                        |  Bin 169 -> 548 bytes
 trean/themes/default/graphics/http/5xx.png                        |  Bin 184 -> 545 bytes
 trean/themes/default/graphics/http/error.png                      |  Bin 184 -> 545 bytes
 trean/themes/default/graphics/minus.png                           |  Bin 181 -> 0 bytes
 trean/themes/default/graphics/perms.png                           |  Bin 243 -> 0 bytes
 trean/themes/default/graphics/plus.png                            |  Bin 208 -> 0 bytes
 trean/themes/default/graphics/protocol/ftp.png                    |  Bin 667 -> 422 bytes
 trean/themes/default/graphics/protocol/http.png                   |  Bin 676 -> 646 bytes
 trean/themes/default/graphics/protocol/https.png                  |  Bin 676 -> 451 bytes
 trean/themes/default/graphics/rating-star.gif                     |  Bin 1947 -> 0 bytes
 trean/themes/default/graphics/search.png                          |  Bin 662 -> 0 bytes
 trean/themes/default/graphics/trean.png                           |  Bin 300 -> 292 bytes
 trean/themes/default/graphics/za.png                              |  Bin 119 -> 0 bytes
 trean/themes/default/screen.css                                   |   52 +--
 turba/docs/CHANGES                                                |    1 +
 turba/lib/Driver/Share.php                                        |   17 +
 turba/package.xml                                                 |    2 +
 turba/templates/search/duplicate/list.html.php                    |    2 +-
 turba/test/Turba/AllTests.php                                     |   44 +--
 turba/test/Turba/Autoload.php                                     |    6 +-
 turba/test/Turba/TestCase.php                                     |    5 -
 turba/test/Turba/ToDo/ApiTest.php                                 |    5 -
 turba/test/Turba/bootstrap.php                                    |    3 +
 turba/test/Turba/phpunit.xml                                      |    2 +-
 wicked/test/Wicked/AllTests.php                                   |   50 +--
 wicked/test/Wicked/Autoload.php                                   |   10 +-
 wicked/test/Wicked/Unit/Driver/SqlTest.php                        |    5 -
 wicked/test/Wicked/Unit/RstTest.php                               |    5 -
 wicked/test/Wicked/bootstrap.php                                  |    3 +
 wicked/test/Wicked/phpunit.xml                                    |    2 +-
 192 files changed, 477 insertions(+), 1459 deletions(-)

http://git.horde.org/horde-git/-/commit/ac9228b3f82a06fc5c29bf921f0327064ea07153

-----------------------------------------------------------------------

commit ed359111944afe677d1cf6970845aa7721e715fe
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 14 01:26:10 2012 -0700

    condense if statement; phpdoc

 framework/Mime/lib/Horde/Mime/Part.php |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/ed359111944afe677d1cf6970845aa7721e715fe

-----------------------------------------------------------------------

commit e948772bda17ddb82b78709d83424ec791676836
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 14 01:40:22 2012 -0700

    Added simple jsmin test

 framework/Text_Filter/package.xml                          |   10 +++-
 framework/Text_Filter/test/Horde/Text/Filter/JsminTest.php |   33 ++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 framework/Text_Filter/test/Horde/Text/Filter/JsminTest.php

http://git.horde.org/horde-git/-/commit/e948772bda17ddb82b78709d83424ec791676836

-----------------------------------------------------------------------

commit ba58f782cf40770040b4ea25b337a14c537d253f
Merge: e948772 44e6f42
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Nov 15 22:47:07 2012 -0700

    Merge branch 'master' into imp_6_1

 content/docs/CHANGES                                              |    8 +-
 content/lib/Application.php                                       |    2 +-
 content/package.xml                                               |   28 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/Autodiscover.php      |  168 +++-
 framework/ActiveSync/package.xml                                  |    4 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   47 +-
 framework/Core/lib/Horde/Core/TagBrowser.php                      |    3 +-
 framework/Core/package.xml                                        |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client.php                   |   22 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Auth/DigestMD5.php    |   26 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |   32 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Debug.php        |   27 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Deprecated.php   |   27 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Mailbox.php      |   27 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Cache.php             |   22 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Acl.php          |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/AclCommon.php    |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/AclNegative.php  |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/AclRights.php    |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/BaseSubject.php  |   25 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Envelope.php     |   21 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Fetch.php        |   22 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Fetch/Pop3.php   |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format.php       |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Astring.php     |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/Atom.php  |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/Date.php  |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/DateTime.php    |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Exception.php   |   20 +-
 .../lib/Horde/Imap/Client/Data/Format/Filter/Quote.php            |   20 +-
 .../lib/Horde/Imap/Client/Data/Format/Filter/String.php           |   22 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/List.php  |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/ListMailbox.php |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Mailbox.php     |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/Nil.php   |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Nstring.php     |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Number.php      |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/String.php      |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Sync.php         |   30 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Thread.php       |   24 +-
 framework/Imap_Client/lib/Horde/Imap/Client/DateTime.php          |   24 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Exception.php         |   26 +-
 .../lib/Horde/Imap/Client/Exception/NoSupportExtension.php        |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Exception/NoSupportPop3.php |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Exception/SearchCharset.php |   22 +-
 .../lib/Horde/Imap/Client/Exception/ServerResponse.php            |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Exception/Sync.php    |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Query.php       |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Results.php     |   22 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Ids.php               |   50 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Ids/Map.php           |   31 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Ids/Pop3.php          |   20 +-
 .../Imap_Client/lib/Horde/Imap/Client/Interaction/Client.php      |   22 +-
 .../Imap_Client/lib/Horde/Imap/Client/Interaction/Server.php      |   22 +-
 .../lib/Horde/Imap/Client/Interaction/Server/Continuation.php     |   20 +-
 .../lib/Horde/Imap/Client/Interaction/Server/Tagged.php           |   20 +-
 .../lib/Horde/Imap/Client/Interaction/Server/Untagged.php         |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Mailbox.php           |   30 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Mailbox/List.php      |   22 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php      |   24 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |   51 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Catenate.php   |   27 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/ClientSort.php |   27 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php       |   51 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php          |   20 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Translation.php       |   17 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Url.php               |   22 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Utf7imap.php          |   22 +-
 framework/Imap_Client/test/Horde/Imap/Client/AclTest.php          |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/AuthTest.php         |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/DataFormatTest.php   |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/DateTimeTest.php     |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/IdsTest.php          |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/MailboxTest.php      |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/MapTest.php          |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/SearchTest.php       |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php       |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/SortTest.php         |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/Stub/DigestMD5.php   |   21 +-
 framework/Imap_Client/test/Horde/Imap/Client/Stub/Socket.php      |   21 +-
 .../Imap_Client/test/Horde/Imap/Client/Stub/SocketClientSort.php  |   21 +-
 framework/Imap_Client/test/Horde/Imap/Client/SubjectParseTest.php |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/TokenizeTest.php     |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/UrlParseTest.php     |   20 +-
 framework/Imap_Client/test/Horde/Imap/Client/Utf7ConvertTest.php  |   18 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Date.php            |   82 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Date.php   |   11 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Date/V1.php      |   10 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/DateTime.php     |   15 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/DateTime/V1.php  |   10 +-
 .../lib/Horde/Kolab/Format/Xml/Type/RecurrenceRange.php           |   15 +-
 framework/Kolab_Format/package.xml                                |    4 +-
 framework/Kolab_Format/test/Horde/Kolab/Format/Unit/DateTest.php  |    8 -
 .../test/Horde/Kolab/Format/Unit/Xml/Type/DateTimeTest.php        |   18 +-
 framework/Vfs/lib/Horde/Vfs/Base.php                              |   26 +-
 framework/Vfs/lib/Horde/Vfs/File.php                              |    6 +-
 framework/Vfs/lib/Horde/Vfs/Ftp.php                               |    8 +-
 framework/Vfs/lib/Horde/Vfs/Smb.php                               |    5 +-
 framework/Vfs/lib/Horde/Vfs/SqlFile.php                           |    5 +-
 framework/Vfs/lib/Horde/Vfs/Ssh2.php                              |    7 +-
 framework/Vfs/package.xml                                         |   26 +-
 framework/Vfs/test/Horde/Vfs/Base.php                             |   14 +-
 gollem/docs/CHANGES                                               |   12 +-
 gollem/docs/INSTALL                                               |    8 +-
 gollem/docs/RELEASE_NOTES                                         |   17 +-
 gollem/docs/UPGRADING                                             |   11 +-
 gollem/lib/Application.php                                        |    2 +-
 gollem/manager.php                                                |    2 +-
 gollem/package.xml                                                |   70 +-
 gollem/quota.php                                                  |    2 +-
 hermes/js/hermes.js                                               |  251 ++++-
 hermes/lib/Ajax.php                                               |    3 +
 hermes/lib/Ajax/Application/Handler.php                           |   39 +-
 hermes/lib/Application.php                                        |   55 +
 hermes/lib/Data/Csv.php                                           |   35 +
 hermes/lib/Data/Hermescsv.php                                     |   36 -
 hermes/lib/Data/Hermestsv.php                                     |   43 -
 hermes/lib/Data/Hermesxls.php                                     |   17 -
 hermes/lib/Data/Iif.php                                           |    1 -
 hermes/lib/Data/Tsv.php                                           |   43 +
 hermes/lib/Driver/Sql.php                                         |   14 +-
 hermes/lib/Hermes.php                                             |  108 ++-
 hermes/lib/Slice.php                                              |    4 +-
 hermes/lib/Table.php                                              |   17 -
 hermes/package.xml                                                |   14 +-
 hermes/templates/dynamic/export.inc                               |   31 +
 hermes/templates/dynamic/index.inc                                |   16 +-
 hermes/templates/dynamic/search.inc                               |  113 ++-
 hermes/themes/default/dynamic/screen.css                          |   58 +-
 horde/admin/user.php                                              |    3 +-
 horde/config/conf.xml                                             |   26 +
 horde/config/hooks.php.dist                                       |   31 +-
 horde/config/registry.php                                         |   20 +-
 horde/docs/CHANGES                                                |    9 +-
 horde/docs/RELEASE_NOTES                                          |   14 +-
 horde/lib/Application.php                                         |    2 +-
 horde/package.xml                                                 |   27 +-
 horde/templates/admin/user/add.inc                                |    3 -
 imp/js/compose-base.js                                            |    4 +-
 imp/js/compose-dimp.js                                            |    8 +-
 imp/lib/Dynamic/Base.php                                          |    8 +-
 imp/lib/Script/Package/ComposeBase.php                            |    6 +-
 ingo/config/backends.php                                          |    2 +-
 ingo/config/hooks.php.dist                                        |    4 +-
 ingo/lib/Ingo.php                                                 |    4 +-
 ingo/lib/Transport/Vfs.php                                        |    9 +-
 kronolith/docs/CHANGES                                            |    4 +
 kronolith/js/kronolith.js                                         |   21 +-
 kronolith/lib/Ajax/Application/Handler.php                        |   22 +-
 kronolith/lib/Driver/Kolab.php                                    |   54 +-
 kronolith/lib/Event.php                                           |    2 +-
 kronolith/lib/Event/Kolab.php                                     |    3 +-
 kronolith/package.xml                                             |    8 +-
 mnemo/docs/CHANGES                                                |    1 +
 mnemo/lib/Driver.php                                              |    6 +-
 mnemo/lib/Driver/Kolab.php                                        |   43 +-
 mnemo/package.xml                                                 |    4 +-
 mnemo/templates/list/memo_headers.inc                             |    4 +-
 nag/docs/CHANGES                                                  |    3 +
 nag/lib/Application.php                                           |    2 +-
 nag/lib/Driver/Kolab.php                                          |   32 +-
 nag/lib/Task.php                                                  |    6 +-
 nag/package.xml                                                   |    4 +
 trean/add.php                                                     |    7 +-
 trean/app/controllers/SaveBookmark.php                            |    2 +-
 trean/docs/CHANGES                                                |   12 +-
 trean/docs/CREDITS                                                |   19 +-
 trean/docs/INSTALL                                                |   44 +-
 trean/docs/RELEASE_NOTES                                          |   34 +
 trean/edit.php                                                    |   11 +-
 trean/favicon.php                                                 |    2 +-
 trean/lib/Ajax/Imple/TagAutoCompleter.php                         |    6 +-
 trean/lib/Application.php                                         |    2 +-
 trean/package.xml                                                 |  192 +++-
 trean/rss.php                                                     |    2 +-
 trean/templates/edit.html.php                                     |    6 +-
 trean/templates/list.html.php                                     |    6 +
 trean/themes/default/screen.css                                   |    8 +
 turba/config/backends.php                                         |    2 +-
 turba/docs/CHANGES                                                |    1 +
 turba/lib/Driver/Kolab.php                                        |   39 +-
 turba/lib/Driver/Share.php                                        |   23 +
 turba/package.xml                                                 |    2 +
 turba/search.php                                                  |    6 +-
 184 files changed, 2669 insertions(+), 1474 deletions(-)

http://git.horde.org/horde-git/-/commit/ba58f782cf40770040b4ea25b337a14c537d253f

-----------------------------------------------------------------------

commit 6ad8182c2c6e2762726198fedd3f0019b3a352ac
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Nov 16 00:20:04 2012 -0700

    [mms] Initialize viewport and mailbox list in single AJAX call when initially loading the dynamic mailbox view.

 imp/docs/CHANGES                             |    2 ++
 imp/js/dimpbase.js                           |   19 +++++++++++--------
 imp/lib/Ajax/Application/Handler/Dynamic.php |   19 +++++++++++++++++++
 imp/package.xml                              |    2 ++
 4 files changed, 34 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/6ad8182c2c6e2762726198fedd3f0019b3a352ac

-----------------------------------------------------------------------

commit 6932f3a89a52c9ea9952b97a20f1d77c7450c052
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Nov 25 18:01:15 2012 -0700

    Remove 'ask' option for the 'request_mdn' preference

 imp/compose.php                              |    8 +++-----
 imp/config/prefs.php                         |    8 ++++----
 imp/docs/UPGRADING                           |   12 ++++++++++++
 imp/lib/Compose.php                          |    3 +--
 imp/lib/Dynamic/Compose/Common.php           |    8 ++------
 imp/lib/LoginTasks/SystemTask/Upgrade.php    |   19 ++++++++++++++++++-
 imp/templates/basic/compose/compose.html.php |    2 +-
 7 files changed, 41 insertions(+), 19 deletions(-)

http://git.horde.org/horde-git/-/commit/6932f3a89a52c9ea9952b97a20f1d77c7450c052

-----------------------------------------------------------------------

commit 8a1b7a2b74e676f24c2911ce1078a9ab08998d11
Merge: 6932f3a c68c102
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Nov 25 23:36:56 2012 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/package.xml

 ansel/js/tagactions.js                                            |    1 +
 ansel/lib/View/Upload.php                                         |   16 -
 ansel/view.php                                                    |    3 -
 chora/locale/nl/LC_MESSAGES/chora.mo                              |  Bin 67082 -> 69883 bytes
 components/data/distribute/openSUSE/components.php                |   18 +-
 content/lib/Tagger.php                                            |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php  |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |   25 +-
 framework/ActiveSync/locale/nl/LC_MESSAGES/Horde_ActiveSync.mo    |  Bin 0 -> 1020 bytes
 framework/ActiveSync/locale/nl/LC_MESSAGES/Horde_ActiveSync.po    |   73 +
 .../Horde/ActiveSync/13_horde_activesync_booleanfields.php        |   42 +
 .../Horde/ActiveSync/14_horde_activesync_binarystatefield.php     |   20 +
 framework/ActiveSync/package.xml                                  |   51 +-
 framework/Alarm/package.xml                                       |   32 +-
 framework/Argv/package.xml                                        |   34 +-
 framework/Auth/package.xml                                        |   30 +-
 framework/Autoloader/package.xml                                  |   34 +-
 framework/Autoloader_Cache/package.xml                            |   23 +-
 framework/Browser/package.xml                                     |   23 +-
 framework/Cache/package.xml                                       |   21 +-
 framework/Cli_Modular/package.xml                                 |   25 +-
 framework/Compress/package.xml                                    |   17 +-
 framework/Constraint/package.xml                                  |   34 +-
 framework/Controller/package.xml                                  |   30 +-
 framework/Core/lib/Horde.php                                      |    4 +-
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php            |    9 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   30 +-
 framework/Core/lib/Horde/Core/Auth/Application.php                |    6 +-
 framework/Core/lib/Horde/Core/Block/Layout/Manager.php            |    1 -
 framework/Core/lib/Horde/Core/Factory/Editor.php                  |    2 -
 framework/Core/lib/Horde/Core/Factory/SessionHandler.php          |    5 -
 framework/Core/lib/Horde/Core/Group/Kolab.php                     |   17 +
 framework/Core/lib/Horde/Core/Mime/Viewer/Vcard.php               |   15 +-
 framework/Core/lib/Horde/Core/Share/Driver.php                    |   17 +-
 framework/Core/lib/Horde/Core/Translation.php                     |   10 +-
 framework/Core/lib/Horde/Core/Ui/Language.php                     |    3 -
 framework/Core/lib/Horde/Core/Ui/TagCloud.php                     |    2 +-
 framework/Core/lib/Horde/Menu.php                                 |    2 +-
 framework/Core/lib/Horde/PageOutput.php                           |    4 +-
 framework/Core/lib/Horde/Registry.php                             |   10 +-
 framework/Core/lib/Horde/Registry/Application.php                 |    4 +-
 framework/Core/lib/Horde/Session.php                              |    2 +-
 framework/Core/package.xml                                        |   37 +-
 framework/Crypt/lib/Horde/Crypt/Smime.php                         |    4 +-
 framework/Crypt/lib/Horde/Crypt/Translation.php                   |   11 +-
 framework/Crypt/package.xml                                       |   19 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish.php             |    8 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Base.php        |    5 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Exception.php   |   20 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Mcrypt.php      |    7 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Openssl.php     |    9 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php.php         |    5 -
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php/Base.php    |    4 -
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php/Cbc.php     |    5 -
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php/Ecb.php     |    5 -
 framework/Crypt_Blowfish/package.xml                              |   58 +-
 framework/Data/package.xml                                        |   19 +-
 framework/DataTree/package.xml                                    |   21 +-
 framework/Date/package.xml                                        |   17 +-
 framework/Date_Parser/package.xml                                 |   34 +-
 framework/Db/package.xml                                          |   32 +-
 framework/Editor/package.xml                                      |   25 +-
 framework/ElasticSearch/package.xml                               |   21 +-
 framework/Exception/package.xml                                   |   17 +-
 framework/Feed/package.xml                                        |   25 +-
 framework/Form/package.xml                                        |   21 +-
 framework/Group/lib/Horde/Group/Kolab.php                         |   26 -
 framework/Group/package.xml                                       |   32 +-
 framework/History/package.xml                                     |   32 +-
 framework/Http/package.xml                                        |   25 +-
 framework/Icalendar/package.xml                                   |   19 +-
 framework/Image/package.xml                                       |   32 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/BaseSubject.php  |    4 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/String.php      |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |   47 +-
 framework/Imap_Client/locale/nl/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 0 -> 7138 bytes
 framework/Imap_Client/locale/nl/LC_MESSAGES/Horde_Imap_Client.po  |  269 +++
 framework/Imap_Client/package.xml                                 |   63 +-
 framework/Injector/package.xml                                    |   32 +-
 framework/Itip/package.xml                                        |   17 +-
 framework/Kolab_Cli/package.xml                                   |   17 +-
 framework/Kolab_Config/package.xml                                |   18 +-
 framework/Kolab_Filter/package.xml                                |   13 +-
 framework/Kolab_Format/package.xml                                |   31 +-
 framework/Kolab_FreeBusy/package.xml                              |   17 +-
 framework/Kolab_Server/package.xml                                |   30 +-
 framework/Kolab_Session/package.xml                               |   30 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php     |    5 +-
 .../lib/Horde/Kolab/Storage/Driver/Decorator/Log.php              |   59 +
 .../lib/Horde/Kolab/Storage/Driver/Decorator/Timer.php            |   60 +
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Synchronization.php     |   37 +-
 .../lib/Horde/Kolab/Storage/Synchronization/OncePerSession.php    |   67 +
 .../lib/Horde/Kolab/Storage/Synchronization/TimeBased.php         |  115 +
 framework/Kolab_Storage/package.xml                               |   35 +-
 .../test/Horde/Kolab/Storage/Unit/Driver/Decorator/LogTest.php    |   27 +
 .../test/Horde/Kolab/Storage/Unit/Driver/Decorator/TimerTest.php  |   45 +
 .../Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php     |  131 ++
 .../Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php    |  145 ++
 framework/Ldap/package.xml                                        |   34 +-
 framework/ListHeaders/package.xml                                 |   34 +-
 framework/Lock/package.xml                                        |   21 +-
 framework/Log/package.xml                                         |   32 +-
 framework/LoginTasks/package.xml                                  |   15 +-
 framework/Mail/lib/Horde/Mail/Exception.php                       |   20 +-
 framework/Mail/lib/Horde/Mail/Rfc822.php                          |   35 +-
 framework/Mail/lib/Horde/Mail/Rfc822/Address.php                  |   26 +-
 framework/Mail/lib/Horde/Mail/Rfc822/Group.php                    |   14 +-
 framework/Mail/lib/Horde/Mail/Rfc822/GroupList.php                |    5 +-
 framework/Mail/lib/Horde/Mail/Rfc822/List.php                     |   18 +-
 framework/Mail/lib/Horde/Mail/Rfc822/Object.php                   |    5 +-
 framework/Mail/lib/Horde/Mail/Transport.php                       |   31 +-
 framework/Mail/lib/Horde/Mail/Transport/Mail.php                  |   20 +-
 framework/Mail/lib/Horde/Mail/Transport/Mock.php                  |   17 +-
 framework/Mail/lib/Horde/Mail/Transport/Null.php                  |   24 +-
 framework/Mail/lib/Horde/Mail/Transport/Sendmail.php              |   20 +-
 framework/Mail/lib/Horde/Mail/Transport/Smtp.php                  |   24 +-
 framework/Mail/lib/Horde/Mail/Transport/Smtpmx.php                |   20 +-
 framework/Mail/package.xml                                        |   32 +-
 framework/Memcache/package.xml                                    |   21 +-
 framework/Mime/package.xml                                        |   17 +-
 framework/Notification/package.xml                                |   30 +-
 framework/Oauth/package.xml                                       |   21 +-
 framework/Pdf/package.xml                                         |   34 +-
 framework/Pear/package.xml                                        |   15 +-
 framework/Perms/package.xml                                       |   15 +-
 framework/Perms/test/Horde/Perms/KolabTest.php                    |    4 +-
 framework/Prefs/package.xml                                       |   15 +-
 framework/PubSub/package.xml                                      |   25 +-
 framework/Push/package.xml                                        |   23 +-
 framework/Queue/lib/Horde/Queue/Runner.php                        |    2 +
 framework/Queue/lib/Horde/Queue/Runner/RequestShutdown.php        |    5 +-
 framework/Rdo/package.xml                                         |   32 +-
 framework/Release/package.xml                                     |   34 +-
 framework/Role/package.xml                                        |   23 +-
 framework/Routes/package.xml                                      |   34 +-
 framework/Scheduler/package.xml                                   |   21 +-
 framework/Scribe/package.xml                                      |   21 +-
 framework/Secret/package.xml                                      |   48 +-
 framework/Serialize/package.xml                                   |   32 +-
 framework/Service_Gravatar/package.xml                            |   12 +-
 framework/Service_Twitter/package.xml                             |   21 +-
 framework/Service_UrlShortener/package.xml                        |   21 +-
 framework/Service_Weather/package.xml                             |   19 +-
 framework/SessionHandler/package.xml                              |   32 +-
 framework/Share/package.xml                                       |   15 +-
 framework/SpellChecker/package.xml                                |   21 +-
 framework/Stream/package.xml                                      |   44 +-
 framework/Stream_Filter/package.xml                               |   34 +-
 framework/Stream_Wrapper/package.xml                              |   21 +-
 framework/Support/package.xml                                     |   36 +-
 framework/Template/package.xml                                    |   34 +-
 framework/Test/package.xml                                        |   34 +-
 framework/Text_Diff/package.xml                                   |   32 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Html2text.php         |   43 +-
 framework/Text_Filter/package.xml                                 |   30 +-
 framework/Text_Filter/test/Horde/Text/Filter/Html2textTest.php    |   65 +-
 framework/Text_Filter_Csstidy/package.xml                         |   32 +-
 framework/Text_Flowed/package.xml                                 |   32 +-
 framework/Text_Textile/package.xml                                |   19 +-
 framework/Thrift/package.xml                                      |   21 +-
 framework/Timezone/package.xml                                    |   19 +-
 framework/Token/package.xml                                       |   15 +-
 framework/Translation/package.xml                                 |   27 +-
 framework/Tree/package.xml                                        |   21 +-
 framework/Url/package.xml                                         |   34 +-
 framework/Util/package.xml                                        |   32 +-
 framework/Vcs/package.xml                                         |   17 +-
 framework/Vfs/package.xml                                         |   13 +-
 framework/View/package.xml                                        |   30 +-
 framework/Xml_Element/package.xml                                 |   34 +-
 framework/Xml_Wbxml/package.xml                                   |   34 +-
 framework/Yaml/package.xml                                        |   34 +-
 gollem/docs/CHANGES                                               |    1 +
 gollem/docs/CREDITS                                               |    1 +
 gollem/locale/nl/LC_MESSAGES/gollem.mo                            |  Bin 69818 -> 70659 bytes
 gollem/locale/nl/LC_MESSAGES/gollem.po                            |  513 ++---
 gollem/package.xml                                                |    4 +-
 hermes/docs/CHANGES                                               |    1 +
 hermes/docs/RELEASE_NOTES                                         |   31 +-
 hermes/js/hermes.js                                               |   86 +-
 hermes/lib/Ajax/Application/Handler.php                           |  321 ++-
 hermes/lib/Application.php                                        |  109 +-
 hermes/lib/Data/Xls.php                                           |   17 +
 hermes/lib/Driver/Sql.php                                         |   15 +-
 hermes/lib/Form/Export.php                                        |    8 +-
 hermes/lib/Hermes.php                                             |   14 +-
 hermes/lib/Table.php                                              |   37 +-
 hermes/package.xml                                                |   10 +-
 hermes/search.php                                                 |   42 +-
 hermes/templates/dynamic/export.inc                               |    2 +-
 hermes/templates/dynamic/index.inc                                |    6 +
 hermes/templates/dynamic/jobtypes.inc                             |   26 +
 hermes/templates/dynamic/search.inc                               |    2 +-
 hermes/templates/dynamic/sidebar.html.php                         |   14 +-
 hermes/themes/default/dynamic/screen.css                          |   11 +-
 hermes/time.php                                                   |   35 +-
 horde/admin/locale/nl/help.xml                                    |   37 +
 horde/locale/nl/LC_MESSAGES/horde.mo                              |  Bin 60156 -> 62901 bytes
 horde/locale/nl/LC_MESSAGES/horde.po                              |   71 +-
 horde/package.xml                                                 |   10 +-
 horde/services/portal/edit.php                                    |    2 +-
 horde/services/shares/edit.php                                    |  305 ++--
 horde/themes/default/screen.css                                   |   10 +-
 imp/config/hooks.php.dist                                         |    4 +-
 imp/docs/CHANGES                                                  |    2 +
 imp/lib/Ajax/Application.php                                      |   26 +-
 imp/lib/Ajax/Application/Compose.php                              |   20 +-
 imp/lib/Ajax/Application/Handler/Common.php                       |   22 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php                      |   20 +-
 imp/lib/Ajax/Application/Handler/ImageUnblock.php                 |   20 +-
 imp/lib/Ajax/Application/Handler/Passphrase.php                   |   20 +-
 imp/lib/Ajax/Application/Handler/Search.php                       |   20 +-
 imp/lib/Ajax/Application/Handler/Smartmobile.php                  |   20 +-
 imp/lib/Ajax/Application/ListMessages.php                         |   20 +-
 imp/lib/Ajax/Application/ShowMessage.php                          |   20 +-
 imp/lib/Ajax/Imple/ContactAutoCompleter.php                       |   20 +-
 imp/lib/Ajax/Imple/ImportEncryptKey.php                           |   20 +-
 imp/lib/Ajax/Imple/ItipRequest.php                                |   20 +-
 imp/lib/Ajax/Imple/PassphraseDialog.php                           |   20 +-
 imp/lib/Ajax/Queue.php                                            |   24 +-
 imp/lib/Api.php                                                   |   30 +-
 imp/lib/Application.php                                           |   25 +-
 imp/lib/Auth.php                                                  |   34 +-
 imp/lib/Block/Newmail.php                                         |   20 +-
 imp/lib/Block/Summary.php                                         |   20 +-
 imp/lib/Compose.php                                               |   48 +-
 imp/lib/Compose/Exception.php                                     |   22 +-
 imp/lib/Compose/View.php                                          |   20 +-
 imp/lib/Contents.php                                              |   26 +-
 imp/lib/Contents/View.php                                         |   20 +-
 imp/lib/Crypt/Pgp.php                                             |   24 +-
 imp/lib/Crypt/Smime.php                                           |   26 +-
 imp/lib/Dynamic/AddressList.php                                   |   20 +-
 imp/lib/Dynamic/Base.php                                          |   20 +-
 imp/lib/Dynamic/Compose.php                                       |   20 +-
 imp/lib/Dynamic/Compose/Common.php                                |   20 +-
 imp/lib/Dynamic/Helper/Base.php                                   |   20 +-
 imp/lib/Dynamic/Mailbox.php                                       |   20 +-
 imp/lib/Dynamic/Message.php                                       |   20 +-
 imp/lib/Exception.php                                             |   20 +-
 imp/lib/Factory/AuthImap.php                                      |   31 +-
 imp/lib/Factory/Compose.php                                       |   31 +-
 imp/lib/Factory/Contents.php                                      |   31 +-
 imp/lib/Factory/Flags.php                                         |   29 +-
 imp/lib/Factory/Identity.php                                      |   29 +-
 imp/lib/Factory/Imap.php                                          |   31 +-
 imp/lib/Factory/Imaptree.php                                      |   29 +-
 imp/lib/Factory/Mail.php                                          |   31 +-
 imp/lib/Factory/Mailbox.php                                       |   31 +-
 imp/lib/Factory/MailboxList.php                                   |   31 +-
 imp/lib/Factory/MimeViewer.php                                    |   31 +-
 imp/lib/Factory/Pgp.php                                           |   29 +-
 imp/lib/Factory/PrefsSort.php                                     |   29 +-
 imp/lib/Factory/Quota.php                                         |   29 +-
 imp/lib/Factory/Search.php                                        |   29 +-
 imp/lib/Factory/Sentmail.php                                      |   29 +-
 imp/lib/Factory/Smime.php                                         |   29 +-
 imp/lib/Filter.php                                                |   30 +-
 imp/lib/Flag/Imap/Answered.php                                    |   20 +-
 imp/lib/Flag/Imap/Deleted.php                                     |   20 +-
 imp/lib/Flag/Imap/Draft.php                                       |   20 +-
 imp/lib/Flags.php                                                 |   22 +-
 imp/lib/IMP.php                                                   |    1 -
 imp/lib/Imap/Acl.php                                              |   22 +-
 imp/lib/Imap/Exception.php                                        |   23 +-
 imp/lib/Imap/PermanentFlags.php                                   |   21 +-
 imp/lib/Imap/Tree.php                                             |   38 +-
 imp/lib/Indices/Form.php                                          |   24 +-
 imp/lib/Mailbox.php                                               |    4 +-
 imp/lib/Mailbox/List.php                                          |   25 +-
 imp/lib/Mime/Viewer/Alternative.php                               |   21 +-
 imp/lib/Mime/Viewer/Appledouble.php                               |   21 +-
 imp/lib/Mime/Viewer/Audio.php                                     |   23 +-
 imp/lib/Mime/Viewer/Enriched.php                                  |   21 +-
 imp/lib/Mime/Viewer/Externalbody.php                              |   20 +-
 imp/lib/Mime/Viewer/Html.php                                      |   25 +-
 imp/lib/Mime/Viewer/Images.php                                    |   21 +-
 imp/lib/Mime/Viewer/Itip.php                                      |   28 +-
 imp/lib/Mime/Viewer/Mdn.php                                       |   22 +-
 imp/lib/Mime/Viewer/Partial.php                                   |   21 +-
 imp/lib/Mime/Viewer/Pdf.php                                       |   21 +-
 imp/lib/Mime/Viewer/Pgp.php                                       |   29 +-
 imp/lib/Mime/Viewer/Plain.php                                     |   23 +-
 imp/lib/Mime/Viewer/Related.php                                   |   21 +-
 imp/lib/Mime/Viewer/Rfc822.php                                    |   22 +-
 imp/lib/Mime/Viewer/Smil.php                                      |   22 +-
 imp/lib/Mime/Viewer/Smime.php                                     |   31 +-
 imp/lib/Mime/Viewer/Status.php                                    |   22 +-
 imp/lib/Mime/Viewer/Vcard.php                                     |   22 +-
 imp/lib/Mime/Viewer/Video.php                                     |   22 +-
 imp/lib/Mime/Viewer/Zip.php                                       |   24 +-
 imp/lib/Search.php                                                |    4 +-
 imp/lib/Sentmail.php                                              |    2 +-
 imp/lib/Sentmail/Null.php                                         |   20 +-
 imp/lib/Sentmail/Sql.php                                          |   22 +-
 imp/lib/Tree/Simplehtml.php                                       |    2 +-
 imp/locale/nl/LC_MESSAGES/imp.mo                                  |  Bin 171322 -> 174210 bytes
 imp/locale/nl/LC_MESSAGES/imp.po                                  |   36 +-
 imp/package.xml                                                   |    2 +
 imp/test/Imp/Autoload.php                                         |    7 +-
 imp/test/Imp/Stub/HtmlViewer.php                                  |   17 +-
 imp/test/Imp/Stub/ItipRequest.php                                 |   16 +-
 imp/test/Imp/Unit/ComposeTest.php                                 |   15 +-
 imp/test/Imp/Unit/MboxParseTest.php                               |   15 +-
 imp/test/Imp/Unit/Mime/Viewer/HtmlTest.php                        |   15 +-
 imp/test/Imp/Unit/Mime/Viewer/ItipTest.php                        |   24 +-
 imp/test/Imp/Unit/QuotaTest.php                                   |   15 +-
 ingo/locale/nl/LC_MESSAGES/ingo.mo                                |  Bin 78953 -> 81722 bytes
 jonah/locale/nl/LC_MESSAGES/jonah.mo                              |  Bin 76580 -> 79341 bytes
 kronolith/bin/kronolith-import-icals                              |    1 -
 kronolith/docs/CHANGES                                            |    1 +
 kronolith/lib/Event/Kolab.php                                     |    3 +
 kronolith/lib/Kronolith.php                                       |    3 +-
 kronolith/locale/nl/LC_MESSAGES/kronolith.mo                      |  Bin 118806 -> 121895 bytes
 kronolith/locale/nl/LC_MESSAGES/kronolith.po                      |   14 +-
 kronolith/package.xml                                             |    2 +
 kronolith/perms.php                                               |  104 +-
 mnemo/locale/nl/LC_MESSAGES/mnemo.mo                              |  Bin 69338 -> 72480 bytes
 mnemo/locale/nl/LC_MESSAGES/mnemo.po                              |   15 +-
 nag/docs/CHANGES                                                  |    1 +
 nag/lib/Driver/Kolab.php                                          |    4 +-
 nag/locale/nl/LC_MESSAGES/nag.mo                                  |  Bin 84605 -> 87366 bytes
 nag/package.xml                                                   |    2 +
 nag/themes/default/graphics/manage.png                            |  Bin 436 -> 0 bytes
 nag/themes/default/screen.css                                     |  129 +-
 passwd/locale/nl/LC_MESSAGES/passwd.mo                            |  Bin 62441 -> 65266 bytes
 timeobjects/locale/nl/LC_MESSAGES/timeobjects.mo                  |  Bin 60745 -> 63442 bytes
 trean/app/controllers/BrowseByTag.php                             |   25 +
 trean/bin/trean-url-checker                                       |  235 +--
 trean/config/conf.xml                                             |   20 +
 trean/config/routes.php                                           |    5 +
 trean/docs/CHANGES                                                |    6 +
 trean/lib/Application.php                                         |   41 +-
 trean/lib/Bookmark.php                                            |   70 +-
 trean/lib/Bookmarks.php                                           |   15 +-
 trean/lib/Form/Search.php                                         |   14 -
 trean/lib/Queue/Task/Crawl.php                                    |   85 +
 trean/lib/TagBrowser.php                                          |    5 +-
 trean/lib/Tagger.php                                              |   20 +
 trean/lib/View/BookmarkList.php                                   |   50 +-
 trean/locale/nl/LC_MESSAGES/trean.mo                              |  Bin 71150 -> 73927 bytes
 trean/package.xml                                                 |   18 +-
 trean/search.php                                                  |   35 +-
 trean/templates/add.html.php                                      |   29 +-
 trean/templates/edit.html.php                                     |   26 +-
 trean/templates/list.html.php                                     |    5 +-
 trean/templates/search.php                                        |    8 -
 trean/themes/default/graphics/tag.png                             |  Bin 0 -> 473 bytes
 trean/themes/default/screen.css                                   |   31 +-
 turba/config/attributes.php                                       |   24 +
 turba/config/backends.php                                         |    8 +-
 turba/docs/CHANGES                                                |    3 +
 turba/lib/Driver/Kolab.php                                        |    4 +-
 turba/locale/nl/LC_MESSAGES/turba.mo                              |  Bin 90215 -> 93700 bytes
 turba/locale/nl/LC_MESSAGES/turba.po                              |   40 +-
 turba/package.xml                                                 |    4 +
 whups/locale/nl/LC_MESSAGES/whups.mo                              |  Bin 93136 -> 95888 bytes
 357 files changed, 6539 insertions(+), 3035 deletions(-)

http://git.horde.org/horde-git/-/commit/8a1b7a2b74e676f24c2911ce1078a9ab08998d11

-----------------------------------------------------------------------

commit ba7c1b36b0d2b02ed6016678f35cdf6bce25adf8
Merge: 8a1b7a2 f7ceaf5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 27 22:35:02 2012 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/Application.php
    	imp/lib/Dynamic/Compose/Common.php
    	imp/package.xml

 bundles/groupware/docs/CHANGES                               |  142 +++++++-
 bundles/groupware/docs/RELEASE_NOTES                         |   22 +-
 bundles/groupware/lib/Bundle.php                             |    2 +-
 bundles/groupware/package.xml                                |   39 ++-
 bundles/webmail/docs/CHANGES                                 |  161 ++++++++-
 bundles/webmail/docs/RELEASE_NOTES                           |   32 ++-
 bundles/webmail/lib/Bundle.php                               |    2 +-
 bundles/webmail/package.xml                                  |   43 ++-
 framework/ActiveSync/package.xml                             |   25 +-
 framework/Cache/package.xml                                  |    2 +-
 framework/Core/lib/Horde.php                                 |    1 -
 framework/Core/lib/Horde/Core/Factory/Group.php              |    8 +-
 framework/Core/lib/Horde/Core/Group/Kolab.php                |   17 -
 framework/Core/lib/Horde/Core/Log/Logger.php                 |    4 +-
 framework/Core/lib/Horde/ErrorHandler.php                    |    9 +-
 framework/Core/package.xml                                   |   29 +-
 framework/ElasticSearch/doc/Horde/ElasticSearch/COPYING      |   24 ++
 framework/ElasticSearch/package.xml                          |   12 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php       |   18 +-
 framework/Imap_Client/package.xml                            |   21 +-
 framework/Kolab_Storage/package.xml                          |   25 +-
 framework/Queue/doc/Horde/Queue/examples/shutdown_runner.php |   15 +-
 framework/Queue/lib/Horde/Queue/Runner/RequestShutdown.php   |    6 +-
 framework/Queue/package.xml                                  |   27 +-
 framework/Text_Filter/package.xml                            |   23 +-
 framework/Vfs/lib/Horde/Vfs/Ftp.php                          |    2 +-
 framework/Vfs/package.xml                                    |   21 +-
 gollem/docs/CHANGES                                          |    8 +
 gollem/docs/RELEASE_NOTES                                    |   17 +-
 gollem/lib/Application.php                                   |    3 +-
 gollem/lib/Gollem.php                                        |  134 +++++---
 gollem/manager.php                                           |   16 +-
 gollem/package.xml                                           |   27 +-
 horde/lib/core.php                                           |    2 +-
 imp/docs/CHANGES                                             |   12 +-
 imp/docs/RELEASE_NOTES                                       |   14 +-
 imp/js/compose-dimp.js                                       |    8 +-
 imp/js/dimpcore.js                                           |    2 +-
 imp/lib/Compose.php                                          |    5 +-
 imp/lib/Crypt/Smime.php                                      |    2 +-
 imp/lib/Dynamic/Compose/Common.php                           |    8 +-
 imp/lib/Flag/Base.php                                        |   46 ++-
 imp/lib/Flag/Imap.php                                        |   20 +-
 imp/lib/Flag/Imap/Flagged.php                                |   20 +-
 imp/lib/Flag/Imap/Forwarded.php                              |   19 +-
 imp/lib/Flag/Imap/Junk.php                                   |   22 +-
 imp/lib/Flag/Imap/NotJunk.php                                |   22 +-
 imp/lib/Flag/Imap/Seen.php                                   |   22 +-
 imp/lib/Flag/System/Attachment.php                           |   23 +-
 imp/lib/Flag/System/Encrypted.php                            |   23 +-
 imp/lib/Flag/System/HighPriority.php                         |   23 +-
 imp/lib/Flag/System/List.php                                 |   23 +-
 imp/lib/Flag/System/LowPriority.php                          |   23 +-
 imp/lib/Flag/System/Match/Address.php                        |   20 +-
 imp/lib/Flag/System/Match/Flag.php                           |   22 +-
 imp/lib/Flag/System/Match/Header.php                         |   22 +-
 imp/lib/Flag/System/Personal.php                             |   21 +-
 imp/lib/Flag/System/Signed.php                               |   23 +-
 imp/lib/Flag/System/Unseen.php                               |   27 +-
 imp/lib/Flag/User.php                                        |   20 +-
 imp/lib/IMP.php                                              |   24 +-
 imp/lib/Imap.php                                             |   28 +-
 imp/lib/Indices.php                                          |   21 +-
 imp/lib/LoginTasks/SystemTask/GarbageCollection.php          |   20 +-
 imp/lib/LoginTasks/SystemTask/Upgrade.php                    |   20 +-
 imp/lib/LoginTasks/SystemTask/UpgradeAuth.php                |   22 +-
 imp/lib/LoginTasks/Task/Autocreate.php                       |   20 +-
 imp/lib/LoginTasks/Task/DeleteAttachmentsMonthly.php         |    9 +-
 imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php            |   20 +-
 imp/lib/LoginTasks/Task/FilterOnLogin.php                    |   20 +-
 imp/lib/LoginTasks/Task/PurgeSentmail.php                    |   22 +-
 imp/lib/LoginTasks/Task/PurgeSpam.php                        |   22 +-
 imp/lib/LoginTasks/Task/PurgeTrash.php                       |   20 +-
 imp/lib/LoginTasks/Task/RecoverDraft.php                     |   20 +-
 imp/lib/LoginTasks/Task/RenameSentmailMonthly.php            |   20 +-
 imp/lib/Mailbox.php                                          |  192 +++++-----
 imp/lib/Mailbox/List.php                                     |   22 +-
 imp/lib/Mailbox/List/Thread.php                              |   29 +-
 imp/lib/Mailbox/List/Track.php                               |   24 +-
 imp/lib/Maillog.php                                          |   22 +-
 imp/lib/Mbox/Parse.php                                       |   26 +-
 imp/lib/Message.php                                          |   32 +-
 imp/lib/Mime/Status.php                                      |   22 +-
 imp/package.xml                                              |   20 +-
 imp/templates/dynamic/mailbox.html.php                       |    6 +-
 imp/themes/default/dynamic/screen.css                        |    3 +
 kronolith/docs/CHANGES                                       |   10 +-
 kronolith/docs/RELEASE_NOTES                                 |   14 +-
 kronolith/lib/Application.php                                |    2 +-
 kronolith/lib/Calendar/Holiday.php                           |    2 +-
 kronolith/lib/Event.php                                      |   65 ++++
 kronolith/lib/Event/Kolab.php                                |   14 +
 kronolith/lib/View/Event.php                                 |   32 +--
 kronolith/package.xml                                        |   30 +-
 kronolith/templates/view/view.inc                            |    8 +-
 mnemo/docs/CHANGES                                           |   11 +-
 mnemo/docs/RELEASE_NOTES                                     |   12 +-
 mnemo/lib/Application.php                                    |    2 +-
 mnemo/lib/Driver/Kolab.php                                   |   11 +-
 mnemo/lib/Driver/Sql.php                                     |   47 ++-
 mnemo/list.php                                               |   13 +-
 mnemo/package.xml                                            |   27 +-
 mnemo/templates/list/memo_summaries.inc                      |    4 +-
 mnemo/templates/view/memo.inc                                |   26 +-
 mnemo/view.php                                               |   29 --
 nag/docs/CHANGES                                             |    9 +-
 nag/docs/RELEASE_NOTES                                       |   24 +-
 nag/lib/Application.php                                      |    2 +-
 nag/lib/Driver/Kolab.php                                     |    6 +
 nag/lib/Driver/Sql.php                                       |   31 ++-
 nag/lib/Task.php                                             |   28 ++
 nag/lib/View/List.php                                        |    8 +-
 nag/package.xml                                              |   32 +-
 nag/templates/view/task.inc                                  |   34 +-
 nag/view.php                                                 |   39 --
 timeobjects/docs/CHANGES                                     |    9 +-
 timeobjects/lib/Application.php                              |    2 +-
 timeobjects/package.xml                                      |   21 +-
 trean/docs/CHANGES                                           |   12 +-
 trean/docs/RELEASE_NOTES                                     |   16 +-
 trean/lib/Application.php                                    |    2 +-
 trean/lib/View/BookmarkList.php                              |    7 +-
 trean/package.xml                                            |   44 ++-
 trean/templates/add.html.php                                 |    2 +-
 trean/templates/block/1line.inc                              |    2 +-
 trean/templates/block/2line.inc                              |    2 +-
 trean/templates/block/standard.inc                           |    2 +-
 trean/templates/edit.html.php                                |    2 +-
 trean/templates/list.html.php                                |   14 +-
 trean/themes/default/graphics/tag.png                        |  Bin 473 -> 395 bytes
 trean/themes/default/screen.css                              |   22 +-
 turba/docs/CHANGES                                           |    8 +-
 turba/docs/RELEASE_NOTES                                     |   20 +-
 turba/lib/Application.php                                    |    2 +-
 turba/package.xml                                            |   30 +-
 135 files changed, 2046 insertions(+), 882 deletions(-)

http://git.horde.org/horde-git/-/commit/ba7c1b36b0d2b02ed6016678f35cdf6bce25adf8

-----------------------------------------------------------------------

commit 1744f4746a5288cadd15a968701be62c7c03daed
Merge: ba7c1b3 7668de8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Nov 29 21:20:39 2012 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/package.xml

 framework/Cache/lib/Horde/Cache/Storage/File.php                  |    6 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php         |   24 +-
 framework/Core/lib/Horde/Core/Factory/Prefs.php                   |    2 +
 framework/Core/lib/Horde/Core/Factory/SpellChecker.php            |   77 ++
 framework/Core/lib/Horde/Registry.php                             |    2 +-
 framework/Core/lib/Horde/Registry/Api.php                         |   25 +-
 framework/Core/package.xml                                        |   20 +-
 framework/Date/lib/Horde/Date/Recurrence.php                      |    8 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |    8 -
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Debug.php        |    8 -
 .../lib/Horde/Imap/Client/Data/Format/Filter/String.php           |   28 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |    4 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php       |   68 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php          |   10 +-
 framework/Imap_Client/package.xml                                 |   25 +-
 framework/Pdf/lib/Horde/Pdf/Writer.php                            |    4 +-
 framework/Pdf/package.xml                                         |    4 +-
 framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php             |    2 +-
 framework/Prefs/package.xml                                       |    4 +-
 framework/Queue/lib/Horde/Queue/Runner.php                        |   11 +
 framework/Queue/lib/Horde/Queue/Runner/RequestShutdown.php        |    2 +-
 .../SessionHandler/lib/Horde/SessionHandler/Storage/File.php      |   28 +-
 framework/SpellChecker/lib/Horde/SpellChecker.php                 |   91 +--
 framework/SpellChecker/lib/Horde/SpellChecker/Aspell.php          |   91 ++-
 framework/SpellChecker/lib/Horde/SpellChecker/Exception.php       |   25 +
 framework/SpellChecker/package.xml                                |   38 +-
 framework/SpellChecker/test/Horde/SpellChecker/AllTests.php       |    3 +
 framework/SpellChecker/test/Horde/SpellChecker/AspellTest.php     |   57 ++
 framework/SpellChecker/test/Horde/SpellChecker/basic-aspell.phpt  |   84 --
 framework/SpellChecker/test/Horde/SpellChecker/bootstrap.php      |    3 +
 framework/SpellChecker/test/Horde/SpellChecker/phpunit.xml        |    1 +
 framework/Vfs/lib/Horde/Vfs/Smb.php                               |  149 +++-
 framework/Vfs/package.xml                                         |    6 +-
 framework/Vfs/test/Horde/Vfs/SmbTest.php                          |  191 ++++-
 framework/Vfs/test/Horde/Vfs/conf.php.dist                        |    7 +
 gollem/manager.php                                                |    2 +-
 horde/config/prefs.php                                            |    5 +-
 horde/docs/CHANGES                                                |    1 +
 horde/lib/Tree/Renderer/Menu.php                                  |    6 +-
 horde/package.xml                                                 |    4 +-
 imp/compose.php                                                   |    9 +-
 imp/config/hooks.php.dist                                         |    2 +-
 imp/docs/CHANGES                                                  |    2 +
 imp/lib/Auth.php                                                  |    4 +-
 imp/lib/Crypt/Pgp.php                                             |    2 +-
 imp/lib/Factory/Imap.php                                          |   51 +-
 imp/lib/Imap/Tree.php                                             |   31 +-
 imp/lib/Mailbox.php                                               |   15 +-
 imp/lib/Quota.php                                                 |   11 +
 imp/lib/Ui/Quota.php                                              |   14 +-
 imp/package.xml                                                   |    1 +
 kronolith/config/prefs.php                                        |    2 +-
 kronolith/docs/CHANGES                                            |    1 +
 kronolith/lib/Calendars/Base.php                                  |   26 +-
 kronolith/lib/Calendars/Default.php                               |    5 +-
 kronolith/lib/Calendars/Kolab.php                                 |    7 +-
 kronolith/lib/Driver/Resource/Sql.php                             |   13 +-
 kronolith/lib/Kronolith.php                                       |   25 +-
 kronolith/package.xml                                             |    4 +-
 mnemo/config/prefs.php                                            |    2 +-
 mnemo/lib/Driver/Sql.php                                          |    2 +-
 mnemo/lib/Mnemo.php                                               |   17 +-
 mnemo/lib/Notepads/Base.php                                       |   28 +-
 mnemo/lib/Notepads/Default.php                                    |    5 +-
 mnemo/lib/Notepads/Kolab.php                                      |    7 +-
 nag/config/prefs.php                                              |    2 +-
 nag/lib/Driver/Sql.php                                            |    1 +
 nag/lib/Nag.php                                                   |   17 +-
 nag/lib/Tasklists/Base.php                                        |   28 +-
 nag/lib/Tasklists/Default.php                                     |    5 +-
 nag/lib/Tasklists/Kolab.php                                       |    7 +-
 passwd/lib/Application.php                                        |    3 +-
 passwd/themes/default/screen.css                                  |    4 +
 sesha/docs/CHANGES                                                |    3 +
 sesha/lib/Application.php                                         |   13 +-
 sesha/lib/Driver/Rdo.php                                          |   44 +-
 sesha/lib/Entity/PropertyMapper.php                               |    3 +
 sesha/lib/Form/Search.php                                         |    1 +
 sesha/lib/View/List.php                                           |   18 +-
 sesha/list.php                                                    |    7 +-
 sesha/package.xml                                                 |    4 +
 sesha/templates/view/list.php                                     |    2 +-
 trean/bin/trean-backfill-crawler                                  |   35 +
 trean/bin/trean-backfill-favicons                                 |   33 +
 trean/bin/trean-url-checker                                       |   90 +--
 trean/config/conf.xml                                             |   14 +-
 trean/favicon.php                                                 |   28 +-
 trean/lib/Application.php                                         |    2 +-
 trean/lib/Bookmark.php                                            |   47 +-
 trean/lib/Bookmarks.php                                           |   10 +-
 trean/lib/Queue/Task/Crawl.php                                    |   67 ++-
 trean/lib/Queue/Task/Favicon.php                                  |  175 ++++
 trean/lib/Trean.php                                               |   23 +-
 trean/migration/5_trean_add_favicon_url.php                       |   32 +
 trean/templates/list.html.php                                     |   20 +-
 trean/themes/default/screen.css                                   |    9 +
 96 files changed, 1457 insertions(+), 710 deletions(-)

http://git.horde.org/horde-git/-/commit/1744f4746a5288cadd15a968701be62c7c03daed

-----------------------------------------------------------------------

commit e4a7358bded59e36e36a0758e2d5d45edb4a22a2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Nov 30 00:32:24 2012 -0700

    phpdoc

 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/e4a7358bded59e36e36a0758e2d5d45edb4a22a2

-----------------------------------------------------------------------

commit 2491e4e4d3a5f1d9690cec7d7f6cfb3ed2346df0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Nov 30 00:41:49 2012 -0700

    Optimize tokenizer

 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php |   16 +++++++++++--
 1 files changed, 13 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/2491e4e4d3a5f1d9690cec7d7f6cfb3ed2346df0

-----------------------------------------------------------------------

commit 4386381381f77d461fd98948d0481489ffb63707
Merge: 2491e4e 07a30eb
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Dec 3 00:25:17 2012 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Dynamic/Compose/Common.php
    	imp/package.xml

 chora/locale/nl/LC_MESSAGES/chora.mo                              |  Bin 69883 -> 69930 bytes
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |   13 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php          |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |   14 +-
 .../Horde/ActiveSync/15_horde_activesync_integerimapuidfield.php  |   22 +
 framework/ActiveSync/package.xml                                  |    4 +-
 framework/Auth/lib/Horde/Auth/Ldap.php                            |    4 +-
 framework/Auth/package.xml                                        |    4 +-
 framework/Core/lib/Horde/Core/ActiveSync/Imap/Factory.php         |   34 +-
 framework/Core/lib/Horde/Core/Tree/Renderer/Html.php              |   16 +-
 framework/Core/lib/Horde/Registry.php                             |    2 +
 framework/Core/locale/nl/LC_MESSAGES/Horde_Core.mo                |  Bin 19396 -> 19335 bytes
 framework/Core/locale/nl/LC_MESSAGES/Horde_Core.po                |   14 +-
 framework/Core/package.xml                                        |    4 +-
 framework/Crypt/locale/nl/LC_MESSAGES/Horde_Crypt.mo              |  Bin 7391 -> 7453 bytes
 framework/Crypt/locale/nl/LC_MESSAGES/Horde_Crypt.po              |    9 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Openssl.php     |   16 +-
 framework/Crypt_Blowfish/package.xml                              |    4 +-
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING             |   10 +
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Mailbox.php     |   16 +
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Nstring.php     |   18 +
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/String.php      |   12 +
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |    6 +-
 framework/Imap_Client/locale/nl/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 7138 -> 6737 bytes
 framework/Imap_Client/locale/nl/LC_MESSAGES/Horde_Imap_Client.po  |  135 +-
 framework/Imap_Client/package.xml                                 |   14 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo.php               |   12 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/common.xsl        | 1165 --
 .../lib/Horde/Mime/Viewer/Ooo/common/measure_conversion.xsl       |  488 +
 .../Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/export/common/body.xsl  |  422 +
 .../lib/Horde/Mime/Viewer/Ooo/export/common/ooo2ms_docpr.xsl      |  139 +
 .../Mime/Viewer/Ooo/export/common/styles/style_collector.xsl      |  828 ++
 .../Mime/Viewer/Ooo/export/common/styles/style_mapping_css.xsl    |  355 +
 .../lib/Horde/Mime/Viewer/Ooo/export/common/table/table.xsl       |  164 +
 .../lib/Horde/Mime/Viewer/Ooo/export/common/table/table_cells.xsl |  279 +
 .../Horde/Mime/Viewer/Ooo/export/common/table/table_columns.xsl   |  243 +
 .../lib/Horde/Mime/Viewer/Ooo/export/common/table/table_rows.xsl  |  212 +
 .../lib/Horde/Mime/Viewer/Ooo/export/common/table_of_content.xsl  |  588 +
 .../Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/export/xhtml/body.xsl   | 2962 +++++
 .../Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/export/xhtml/header.xsl |  485 +
 .../lib/Horde/Mime/Viewer/Ooo/export/xhtml/opendoc2xhtml.xsl      |  183 +
 .../Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/export/xhtml/table.xsl  |  222 +
 .../Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/global_document.xsl     | 1674 ---
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/main_html.xsl     |  462 -
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/palm.xsl          |  404 -
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/style_header.xsl  |  379 -
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/style_inlined.xsl |  398 -
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/style_mapping.xsl |  660 -
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/table.xsl         |  328 -
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/table_cells.xsl   |  484 -
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/table_columns.xsl |  215 -
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo/table_rows.xsl    |  177 -
 framework/Mime_Viewer/package.xml                                 |    4 +-
 framework/Nls/locale/nl/LC_MESSAGES/Horde_Nls.mo                  |  Bin 20747 -> 20747 bytes
 framework/Nls/locale/nl/LC_MESSAGES/Horde_Nls.po                  |    6 +-
 gollem/docs/CHANGES                                               |    1 +
 gollem/js/login.js                                                |    1 +
 gollem/lib/Application.php                                        |    4 +-
 gollem/locale/nl/LC_MESSAGES/gollem.mo                            |  Bin 70659 -> 70710 bytes
 gollem/locale/nl/LC_MESSAGES/gollem.po                            |   10 +-
 gollem/package.xml                                                |    4 +-
 horde/config/prefs.php                                            |    5 +
 horde/lib/View/Sidebar.php                                        |    2 +
 horde/locale/nl/LC_MESSAGES/horde.mo                              |  Bin 62901 -> 62949 bytes
 horde/locale/nl/LC_MESSAGES/horde.po                              |   69 +-
 horde/templates/admin/groups/edit.inc                             |    4 +-
 horde/templates/sidebar/sidebar.html.php                          |    2 +-
 horde/templates/tree/_row.html.php                                |    2 +-
 horde/themes/default/rtl.css                                      |  122 +-
 horde/themes/default/screen.css                                   |    5 -
 imp/compose.php                                                   |   26 +-
 imp/docs/CHANGES                                                  |    5 +
 imp/js/search.js                                                  |    1 +
 imp/lib/Application.php                                           |    5 +-
 imp/lib/Compose.php                                               |   41 +-
 imp/lib/Dynamic/Compose.php                                       |    2 +-
 imp/lib/Dynamic/Compose/Common.php                                |   10 +-
 imp/lib/IMP.php                                                   |    2 +-
 imp/lib/Imap/Tree.php                                             |   18 +-
 imp/lib/LoginTasks/SystemTask/Upgrade.php                         |   10 +-
 imp/lib/Minimal/Compose.php                                       |    3 +-
 imp/lib/Smartmobile.php                                           |    1 +
 imp/locale/nl/LC_MESSAGES/imp.mo                                  |  Bin 174210 -> 174206 bytes
 imp/locale/nl/LC_MESSAGES/imp.po                                  |   32 +-
 imp/package.xml                                                   |    3 +
 imp/templates/dynamic/compose.html.php                            |    1 +
 imp/templates/minimal/compose.html.php                            |    1 +
 imp/templates/smartmobile/compose.html.php                        |    1 +
 ingo/locale/nl/LC_MESSAGES/ingo.mo                                |  Bin 81722 -> 81832 bytes
 ingo/locale/nl/LC_MESSAGES/ingo.po                                |   14 +-
 jonah/locale/nl/LC_MESSAGES/jonah.mo                              |  Bin 79341 -> 79388 bytes
 kronolith/locale/nl/LC_MESSAGES/kronolith.mo                      |  Bin 121895 -> 122010 bytes
 kronolith/locale/nl/LC_MESSAGES/kronolith.po                      |   17 +-
 kronolith/templates/dynamic/index.inc                             |    2 +-
 mnemo/locale/nl/LC_MESSAGES/mnemo.mo                              |  Bin 72480 -> 72531 bytes
 mnemo/locale/nl/LC_MESSAGES/mnemo.po                              |   13 +-
 nag/lib/Ui/VarRenderer/Nag.php                                    |    6 +-
 nag/locale/nl/LC_MESSAGES/nag.mo                                  |  Bin 87366 -> 87327 bytes
 nag/locale/nl/LC_MESSAGES/nag.po                                  |   36 +-
 passwd/config/backends.php                                        |    2 +-
 passwd/index.php                                                  |    1 +
 passwd/js/passwd.js                                               |   18 +-
 passwd/lib/Application.php                                        |    8 -
 passwd/locale/nl/LC_MESSAGES/passwd.mo                            |  Bin 65266 -> 65314 bytes
 passwd/templates/index.html.php                                   |   60 +-
 passwd/themes/default/graphics/favicon.ico                        |  Bin 1150 -> 1742 bytes
 passwd/themes/default/graphics/passwd.png                         |  Bin 505 -> 429 bytes
 passwd/themes/default/screen.css                                  |    4 -
 timeobjects/locale/nl/LC_MESSAGES/timeobjects.mo                  |  Bin 63442 -> 63490 bytes
 trean/locale/nl/LC_MESSAGES/trean.mo                              |  Bin 73927 -> 73974 bytes
 turba/lib/Api.php                                                 |    1 -
 turba/locale/nl/LC_MESSAGES/turba.mo                              |  Bin 93700 -> 93748 bytes
 turba/locale/nl/LC_MESSAGES/turba.po                              |    8 +-
 whups/locale/nl/LC_MESSAGES/whups.mo                              |  Bin 95888 -> 95935 bytes
 114 files changed, 8109 insertions(+), 6786 deletions(-)

http://git.horde.org/horde-git/-/commit/4386381381f77d461fd98948d0481489ffb63707

-----------------------------------------------------------------------

commit 583c384d243c248ca5c8d7aeb0f14407fbc884f5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Dec 3 00:26:50 2012 -0700

    Create mailbox is a better description

 imp/lib/Dynamic/Mailbox.php              |    2 +-
 imp/templates/basic/flist/flist.html.php |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/583c384d243c248ca5c8d7aeb0f14407fbc884f5

-----------------------------------------------------------------------

commit 1635be0be1ad8120d0075b32ee7404227d11d5d3
Merge: 583c384 b7bbdb4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Dec 5 00:38:45 2012 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/package.xml

 bundles/kolab_webmail/kronolith/config/hooks.php                  |   59 -
 bundles/kolab_webmail/mnemo/config/hooks.php                      |   59 -
 bundles/kolab_webmail/nag/config/hooks.php                        |   59 -
 bundles/kolab_webmail/turba/config/hooks.php                      |   22 -
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php  |   10 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php  |   47 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php         |   32 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |    3 +-
 .../lib/Horde/ActiveSync/Message/AirSyncBaseAttachment.php        |   19 +
 .../ActiveSync/lib/Horde/ActiveSync/Message/AirSyncBaseBody.php   |   21 +
 .../lib/Horde/ActiveSync/Message/AirSyncBaseFileAttachment.php    |   20 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php |   27 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Attachment.php  |   17 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Attendee.php    |   16 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php        |    7 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Contact.php     |   88 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Exception.php   |   30 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Flag.php        |   32 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Folder.php      |   19 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Mail.php        |   54 +-
 .../ActiveSync/lib/Horde/ActiveSync/Message/MeetingRequest.php    |   82 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Recurrence.php  |   19 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Task.php        |   17 +
 .../ActiveSync/lib/Horde/ActiveSync/Message/TaskRecurrence.php    |   20 +
 .../ActiveSync/lib/Horde/ActiveSync/Request/Autodiscover.php      |    6 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php      |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php  |    7 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/ItemOperations.php    |   10 +
 framework/ActiveSync/lib/Horde/ActiveSync/Request/SendMail.php    |    7 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |    9 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |    8 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php       |    4 +-
 framework/ActiveSync/package.xml                                  |    4 +
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php            |    7 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   55 +-
 framework/Core/lib/Horde/Core/Prefs/Ui.php                        |   12 +-
 framework/Core/lib/Horde/Session/Null.php                         |    6 +-
 framework/Core/package.xml                                        |    8 +
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |    4 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php          |  212 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/List.php     |  103 +
 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/Master.php   |  218 +
 framework/Imap_Client/package.xml                                 |   34 +-
 framework/Imap_Client/test/Horde/Imap/Client/Stub/Socket.php      |   10 +-
 framework/Imap_Client/test/Horde/Imap/Client/TokenizeTest.php     |   88 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Date.php            |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Event.php       |   28 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/EventDate.php    |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/EventDate/V1.php |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/EventDateTime.php             |   38 +
 .../lib/Horde/Kolab/Format/Xml/Type/EventDateTime/V1.php          |   38 +
 framework/Kolab_Format/package.xml                                |   18 +-
 framework/Mail/lib/Horde/Mail/Rfc822.php                          |   64 +-
 framework/Mail/package.xml                                        |   21 +-
 framework/Mail/test/Horde/Mail/ParseTest.php                      |   23 +
 framework/Mime_Viewer/package.xml                                 |   68 +-
 imp/config/prefs.php                                              |    3 +
 imp/docs/CHANGES                                                  |    2 +
 imp/lib/Imap/Tree.php                                             |   19 +-
 imp/locale/fr/LC_MESSAGES/imp.mo                                  |  Bin 194112 -> 190052 bytes
 imp/locale/fr/LC_MESSAGES/imp.po                                  | 4911 ++---
 imp/package.xml                                                   |    1 +
 kronolith/config/prefs.php                                        |    3 +
 kronolith/docs/CHANGES                                            |    3 +
 kronolith/js/kronolith.js                                         |    8 +-
 kronolith/lib/Calendars/Base.php                                  |   28 +
 kronolith/lib/Calendars/Kolab.php                                 |   21 +
 kronolith/lib/Kronolith.php                                       |   11 +-
 kronolith/package.xml                                             |    6 +
 mnemo/config/prefs.php                                            |    5 +
 mnemo/docs/CHANGES                                                |    2 +
 mnemo/lib/Mnemo.php                                               |   11 +-
 mnemo/lib/Notepads/Base.php                                       |   28 +
 mnemo/lib/Notepads/Kolab.php                                      |   21 +
 mnemo/package.xml                                                 |    6 +-
 nag/config/prefs.php                                              |    3 +
 nag/docs/CHANGES                                                  |    2 +
 nag/lib/Nag.php                                                   |   11 +-
 nag/lib/Tasklists/Base.php                                        |   28 +
 nag/lib/Tasklists/Kolab.php                                       |   21 +
 nag/package.xml                                                   |    6 +-
 trean/docs/CHANGES                                                |    1 +
 trean/lib/Api.php                                                 |   20 +-
 trean/lib/Application.php                                         |    4 +-
 trean/lib/Block/Mostclicked.php                                   |    2 +-
 trean/lib/Bookmarks.php                                           |    9 +-
 trean/lib/Queue/Task/Crawl.php                                    |    1 -
 trean/package.xml                                                 |    4 +-
 turba/config/prefs.php                                            |    9 +-
 turba/docs/CHANGES                                                |    4 +
 turba/lib/Driver.php                                              |    9 +
 turba/lib/Driver/Kolab.php                                        |   21 +
 turba/locale/fr/LC_MESSAGES/turba.mo                              |  Bin 105352 -> 105492 bytes
 turba/locale/fr/LC_MESSAGES/turba.po                              |  840 +-
 turba/package.xml                                                 |    6 +-
 95 files changed, 4400 insertions(+), 3587 deletions(-)

http://git.horde.org/horde-git/-/commit/1635be0be1ad8120d0075b32ee7404227d11d5d3

-----------------------------------------------------------------------

commit 8d2c1c14eb472fa9b38e452f474a19b7ebc7652d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Dec 5 01:16:43 2012 -0700

    fix tostring - it is causing segfaults for some reason if casting master object to a string

 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/List.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8d2c1c14eb472fa9b38e452f474a19b7ebc7652d

-----------------------------------------------------------------------

commit 9a39c73c728c2fb0a7387f734122bb0a9affa988
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Dec 5 01:33:50 2012 -0700

    Fix iterator flushing within sublevel objects

 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/Master.php |   20 ++++++-
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php     |    8 +++
 2 files changed, 25 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/9a39c73c728c2fb0a7387f734122bb0a9affa988

-----------------------------------------------------------------------

commit f955928fc7073f945291ab5b4b591e688f9c7f2a
Merge: 9a39c73 86e3fb4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Dec 5 14:17:14 2012 -0700

    Merge branch 'master' into imp_6_1


http://git.horde.org/horde-git/-/commit/f955928fc7073f945291ab5b4b591e688f9c7f2a

-----------------------------------------------------------------------

commit 0b3d5e983e5bdd96d7658e54f60f8772e254bcde
Merge: f955928 67ec37e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Dec 5 15:43:23 2012 -0700

    Merge branch 'master' into imp_6_1

 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING             |   10 +
 framework/Imap_Client/lib/Horde/Imap/Client.php                   |    4 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |   53 +++-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/ClientSort.php |   12 +-
 framework/Imap_Client/package.xml                                 |   27 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Event.php       |   30 ++
 .../lib/Horde/Kolab/Format/Xml/Type/EventDateTime/V1.php          |   29 ++
 framework/Perms/lib/Horde/Perms/Permission/Kolab.php              |   14 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl/Creator.php  |   43 ---
 framework/Perms/lib/Horde/Perms/Permission/Kolab/AclIterator.php  |   11 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/Element/Creator.php    |   81 -----
 .../Perms/lib/Horde/Perms/Permission/Kolab/ElementIterator.php    |   21 +-
 framework/Perms/package.xml                                       |   14 +-
 framework/Perms/test/Horde/Perms/KolabTest.php                    |   72 +----
 framework/Share/test/Horde/Share/Kolab/UnitTest.php               |    9 +-
 kronolith/lib/Event/Holidays.php                                  |    1 +
 16 files changed, 177 insertions(+), 254 deletions(-)

http://git.horde.org/horde-git/-/commit/0b3d5e983e5bdd96d7658e54f60f8772e254bcde

-----------------------------------------------------------------------

commit 92b1182dcb38edcd8b73cbbf31d07f14e434b1a0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Dec 5 15:46:00 2012 -0700

    Use new Imap_Client SORT_*_FALLBACK criteria to sort address fields

 imp/lib/Imap.php |   19 ++++++-------------
 imp/package.xml  |    2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/92b1182dcb38edcd8b73cbbf31d07f14e434b1a0

-----------------------------------------------------------------------

commit d135590ac5091e89de8ffecdebef8fcff0720e72
Merge: 92b1182 98ca3a5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Dec 11 23:02:46 2012 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Imap.php
    	imp/package.xml
    	ingo/docs/CHANGES
    	ingo/package.xml

 ansel/lib/Ajax/Imple/EditCaption.php                              |   11 +-
 ansel/lib/Tile/Image.php                                          |    2 +-
 ansel/lib/View/Image.php                                          |   56 +-
 ansel/templates/view/image.inc                                    |   49 -
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php         |   21 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |   11 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |   11 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php        |   14 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Folder.php      |    6 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Mail.php        |    6 +
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php        |   10 +
 framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php  |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php   |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php        |   12 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/ResolveRecipients.php |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php      |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/SendMail.php    |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |  111 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php          |   28 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |  135 ++-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php       |   15 +-
 framework/ActiveSync/package.xml                                  |   30 +-
 framework/Core/js/spellchecker.js                                 |    8 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   30 +-
 framework/Core/lib/Horde/Core/ActiveSync/Logger/Factory.php       |   16 -
 framework/Core/lib/Horde/Core/Ajax/Imple/ContactAutoCompleter.php |    4 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/InPlaceEditor.php        |    4 +-
 framework/Core/lib/Horde/Core/Smartmobile/View/Helper.php         |    1 +
 framework/Core/lib/Horde/Core/Tagger.php                          |   63 +-
 framework/Core/lib/Horde/Core/Tree/Renderer/Html.php              |   16 +-
 framework/Core/lib/Horde/PageOutput.php                           |    2 +-
 framework/Core/package.xml                                        |   30 +-
 framework/Date/lib/Horde/Date.php                                 |    2 +-
 framework/Date/package.xml                                        |    4 +-
 framework/Date/test/Horde/Date/DateTest.php                       |   16 +-
 .../Imap_Client/lib/Horde/Imap/Client/Interaction/Server.php      |    5 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |  308 ++---
 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php          |  234 +++-
 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/List.php     |  106 --
 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/Master.php   |  232 ----
 framework/Imap_Client/package.xml                                 |   25 +-
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php       |    8 -
 framework/Imap_Client/test/Horde/Imap/Client/Stub/Socket.php      |   14 +-
 framework/Imap_Client/test/Horde/Imap/Client/TokenizeTest.php     |  306 +++--
 gollem/config/prefs.php                                           |    2 +-
 gollem/docs/CHANGES                                               |    2 +
 gollem/migration/2_gollem_upgrade_autoincrement.php               |   37 +
 gollem/package.xml                                                |   12 +-
 horde/config/prefs.php                                            |    6 +-
 horde/js/sidebar.js                                               |    4 +-
 horde/services/portal/smartmobile.php                             |    2 +-
 horde/templates/portal/smartmobile.inc                            |    2 +-
 imp/docs/CHANGES                                                  |    4 +
 imp/lib/Ajax/Application/Handler/Dynamic.php                      |    1 -
 imp/lib/Ajax/Imple/ContactAutoCompleter.php                       |    7 +-
 imp/lib/Contents.php                                              |    1 +
 imp/lib/Imap/Tree.php                                             |    6 +-
 imp/lib/Ui/Compose.php                                            |    2 +-
 imp/package.xml                                                   |    2 +
 ingo/docs/CHANGES                                                 |    1 +
 ingo/lib/Ingo.php                                                 |    2 +-
 ingo/package.xml                                                  |    2 +
 kronolith/docs/CHANGES                                            |    3 +
 kronolith/lib/Calendar/Internal.php                               |    3 +-
 kronolith/lib/Driver/Kolab.php                                    |   10 +-
 kronolith/lib/Kronolith.php                                       |    4 +-
 kronolith/package.xml                                             |    6 +
 mnemo/lib/Driver/Sql.php                                          |    1 +
 nag/docs/CHANGES                                                  |    2 +
 nag/js/smartmobile.js                                             |    1 -
 nag/lib/Search.php                                                |    9 +-
 nag/package.xml                                                   |    2 +
 sesha/admin.php                                                   |    7 +-
 sesha/docs/CHANGES                                                |   12 +
 sesha/docs/RELEASE_NOTES                                          |   10 +-
 sesha/lib/Driver/Rdo.php                                          |    7 +-
 sesha/lib/Entity/PropertyMapper.php                               |    4 +-
 sesha/lib/Entity/Value.php                                        |   38 +-
 sesha/list.php                                                    |   21 +-
 sesha/package.xml                                                 |   44 +-
 sesha/search.php                                                  |    7 +-
 sesha/stock.php                                                   |    8 +-
 sesha/templates/menu.inc                                          |    9 -
 turba/lib/Driver/Share.php                                        |   10 +
 85 files changed, 1256 insertions(+), 1035 deletions(-)

http://git.horde.org/horde-git/-/commit/d135590ac5091e89de8ffecdebef8fcff0720e72

-----------------------------------------------------------------------

commit 8eabecfdf6929457b74c2cf0c7b2177ea0f70397
Merge: d135590 1ce4cf7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 20 20:52:14 2012 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/package.xml
    	ingo/docs/CHANGES
    	ingo/package.xml

 agora/locale/es/LC_MESSAGES/agora.mo                              |  Bin 83364 -> 80945 bytes
 ansel/gallery.php                                                 |   16 +-
 ansel/lib/Ansel.php                                               |    1 -
 ansel/lib/Prefs/Special/GallerySelect.php                         |    2 +-
 ansel/lib/Prefs/Special/GalleryStyle.php                          |   44 +
 ansel/lib/View/Ansel.php                                          |    6 +-
 ansel/lib/Widget/Actions.php                                      |    4 +-
 ansel/lib/Widget/Base.php                                         |    7 +-
 ansel/lib/Widget/Geotag.php                                       |    3 -
 ansel/lib/Widget/OtherGalleries.php                               |   38 +-
 ansel/locale/es/LC_MESSAGES/ansel.mo                              |  Bin 115509 -> 113020 bytes
 ansel/package.xml                                                 |   12 +-
 chora/locale/es/LC_MESSAGES/chora.mo                              |  Bin 73548 -> 71112 bytes
 framework/ActiveSync/doc/Horde/ActiveSync/TODO                    |   10 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php  |   45 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |  152 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php        |   23 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Mail.php        |   17 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php      |   13 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |   12 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Sync.php                |   10 +-
 framework/ActiveSync/locale/eu/LC_MESSAGES/Horde_ActiveSync.mo    |  Bin 0 -> 944 bytes
 framework/ActiveSync/locale/eu/LC_MESSAGES/Horde_ActiveSync.po    |   70 +
 framework/ActiveSync/package.xml                                  |   63 +-
 framework/Alarm/locale/es/LC_MESSAGES/Horde_Alarm.mo              |  Bin 822 -> 822 bytes
 framework/Alarm/locale/es/LC_MESSAGES/Horde_Alarm.po              |    6 +-
 framework/Alarm/locale/eu/LC_MESSAGES/Horde_Alarm.mo              |  Bin 380 -> 762 bytes
 framework/Alarm/locale/eu/LC_MESSAGES/Horde_Alarm.po              |   29 +-
 framework/Alarm/package.xml                                       |    4 +-
 framework/Argv/locale/eu/LC_MESSAGES/Horde_Argv.mo                |  Bin 379 -> 585 bytes
 framework/Argv/locale/eu/LC_MESSAGES/Horde_Argv.po                |   68 +-
 framework/Argv/package.xml                                        |    4 +-
 framework/Auth/locale/es/LC_MESSAGES/Horde_Auth.mo                |  Bin 3120 -> 3352 bytes
 framework/Auth/locale/es/LC_MESSAGES/Horde_Auth.po                |   35 +-
 framework/Auth/locale/eu/LC_MESSAGES/Horde_Auth.mo                |  Bin 0 -> 742 bytes
 framework/Auth/locale/eu/LC_MESSAGES/Horde_Auth.po                |  100 +
 framework/Auth/package.xml                                        |    2 +
 framework/Browser/lib/Horde/Browser.php                           |    3 +-
 framework/Browser/locale/es/LC_MESSAGES/Horde_Browser.mo          |  Bin 1396 -> 1396 bytes
 framework/Browser/locale/es/LC_MESSAGES/Horde_Browser.po          |   14 +-
 framework/Browser/locale/eu/LC_MESSAGES/Horde_Browser.mo          |  Bin 1112 -> 1149 bytes
 framework/Browser/locale/eu/LC_MESSAGES/Horde_Browser.po          |   24 +-
 framework/Browser/package.xml                                     |    6 +-
 framework/Cli/locale/es/LC_MESSAGES/Horde_Cli.mo                  |  Bin 671 -> 763 bytes
 framework/Cli/locale/es/LC_MESSAGES/Horde_Cli.po                  |   18 +-
 framework/Cli/locale/eu/LC_MESSAGES/Horde_Cli.mo                  |  Bin 378 -> 696 bytes
 framework/Cli/locale/eu/LC_MESSAGES/Horde_Cli.po                  |   32 +-
 framework/Cli/package.xml                                         |    4 +-
 framework/Compress/locale/es/LC_MESSAGES/Horde_Compress.mo        |  Bin 982 -> 982 bytes
 framework/Compress/locale/es/LC_MESSAGES/Horde_Compress.po        |   10 +-
 framework/Compress/locale/eu/LC_MESSAGES/Horde_Compress.mo        |  Bin 383 -> 731 bytes
 framework/Compress/locale/eu/LC_MESSAGES/Horde_Compress.po        |   37 +-
 framework/Compress/package.xml                                    |    4 +-
 framework/Core/js/hordecore.js                                    |   20 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   12 +-
 framework/Core/lib/Horde/Core/ActiveSync/Imap/Factory.php         |    6 +
 framework/Core/lib/Horde/Core/TagBrowser.php                      |    2 +-
 framework/Core/lib/Horde/Themes/Cache.php                         |    8 +-
 framework/Core/locale/es/LC_MESSAGES/Horde_Core.mo                |  Bin 16711 -> 19768 bytes
 framework/Core/locale/es/LC_MESSAGES/Horde_Core.po                |  705 +-
 framework/Core/locale/eu/LC_MESSAGES/Horde_Core.mo                |  Bin 0 -> 5850 bytes
 framework/Core/locale/eu/LC_MESSAGES/Horde_Core.po                | 1306 +-
 framework/Core/package.xml                                        |   41 +-
 framework/Crypt/locale/es/LC_MESSAGES/Horde_Crypt.mo              |  Bin 8605 -> 7498 bytes
 framework/Crypt/locale/es/LC_MESSAGES/Horde_Crypt.po              |  214 +-
 framework/Crypt/locale/eu/LC_MESSAGES/Horde_Crypt.mo              |  Bin 380 -> 805 bytes
 framework/Crypt/locale/eu/LC_MESSAGES/Horde_Crypt.po              |  390 +-
 framework/Crypt/package.xml                                       |    4 +-
 framework/Data/locale/es/LC_MESSAGES/Horde_Data.mo                |  Bin 1199 -> 1330 bytes
 framework/Data/locale/es/LC_MESSAGES/Horde_Data.po                |   18 +-
 framework/Data/locale/eu/LC_MESSAGES/Horde_Data.mo                |  Bin 379 -> 851 bytes
 framework/Data/locale/eu/LC_MESSAGES/Horde_Data.po                |   43 +-
 framework/Data/package.xml                                        |    4 +-
 framework/Date/locale/es/LC_MESSAGES/Horde_Date.mo                |  Bin 1200 -> 1200 bytes
 framework/Date/locale/es/LC_MESSAGES/Horde_Date.po                |    4 +-
 framework/Date/locale/eu/LC_MESSAGES/Horde_Date.mo                |  Bin 0 -> 488 bytes
 framework/Date/locale/eu/LC_MESSAGES/Horde_Date.po                |   88 +-
 framework/Date/package.xml                                        |    2 +
 framework/Exception/locale/eu/LC_MESSAGES/Horde_Exception.mo      |  Bin 384 -> 591 bytes
 framework/Exception/locale/eu/LC_MESSAGES/Horde_Exception.po      |   20 +-
 framework/Exception/package.xml                                   |    4 +-
 framework/Form/locale/es/LC_MESSAGES/Horde_Form.mo                |  Bin 11154 -> 11214 bytes
 framework/Form/locale/es/LC_MESSAGES/Horde_Form.po                |  303 +-
 framework/Form/locale/eu/LC_MESSAGES/Horde_Form.mo                |  Bin 0 -> 1098 bytes
 framework/Form/locale/eu/LC_MESSAGES/Horde_Form.po                |  729 +-
 framework/Form/package.xml                                        |    4 +-
 framework/Icalendar/locale/eu/LC_MESSAGES/Horde_Icalendar.mo      |  Bin 384 -> 553 bytes
 framework/Icalendar/locale/eu/LC_MESSAGES/Horde_Icalendar.po      |   16 +-
 framework/Icalendar/package.xml                                   |    4 +-
 framework/Image/locale/eu/LC_MESSAGES/Horde_Image.mo              |  Bin 380 -> 1279 bytes
 framework/Image/locale/eu/LC_MESSAGES/Horde_Image.po              | 1417 +-
 framework/Image/package.xml                                       |    4 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |   41 +-
 framework/Imap_Client/locale/es/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 6207 -> 6958 bytes
 framework/Imap_Client/locale/es/LC_MESSAGES/Horde_Imap_Client.po  |  148 +-
 framework/Imap_Client/locale/eu/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 0 -> 1408 bytes
 framework/Imap_Client/locale/eu/LC_MESSAGES/Horde_Imap_Client.po  |  277 +
 framework/Imap_Client/package.xml                                 |   50 +-
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php       |   26 +
 .../Imap_Client/test/Horde/Imap/Client/fixtures/test_email.txt    |   14 -
 .../Imap_Client/test/Horde/Imap/Client/fixtures/test_email2.txt   |  112 -
 framework/Imsp/locale/eu/LC_MESSAGES/Horde_Imsp.mo                |  Bin 383 -> 569 bytes
 framework/Imsp/locale/eu/LC_MESSAGES/Horde_Imsp.po                |   18 +-
 framework/Imsp/package.xml                                        |    4 +-
 framework/Itip/locale/eu/LC_MESSAGES/Horde_Itip.mo                |  Bin 379 -> 603 bytes
 framework/Itip/locale/eu/LC_MESSAGES/Horde_Itip.po                |   56 +-
 framework/Itip/package.xml                                        |    4 +-
 framework/Kolab_Cli/locale/eu/LC_MESSAGES/Horde_Kolab_Cli.mo      |  Bin 0 -> 492 bytes
 framework/Kolab_Cli/locale/eu/LC_MESSAGES/Horde_Kolab_Cli.po      |  226 +
 framework/Kolab_Cli/package.xml                                   |    4 +-
 .../Kolab_FreeBusy/locale/eu/LC_MESSAGES/Horde_Kolab_FreeBusy.mo  |  Bin 389 -> 623 bytes
 .../Kolab_FreeBusy/locale/eu/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |  100 +-
 framework/Kolab_FreeBusy/package.xml                              |    2 +
 .../Kolab_Resource/locale/eu/LC_MESSAGES/Horde_Kolab_Resource.mo  |  Bin 389 -> 988 bytes
 .../Kolab_Resource/locale/eu/LC_MESSAGES/Horde_Kolab_Resource.po  |   36 +-
 framework/Kolab_Resource/package.xml                              |    2 +
 .../Kolab_Storage/locale/es/LC_MESSAGES/Horde_Kolab_Storage.mo    |  Bin 7502 -> 5912 bytes
 .../Kolab_Storage/locale/es/LC_MESSAGES/Horde_Kolab_Storage.po    |  317 +-
 .../Kolab_Storage/locale/eu/LC_MESSAGES/Horde_Kolab_Storage.mo    |  Bin 388 -> 496 bytes
 .../Kolab_Storage/locale/eu/LC_MESSAGES/Horde_Kolab_Storage.po    |  272 +-
 framework/Kolab_Storage/package.xml                               |    4 +-
 framework/LoginTasks/locale/eu/LC_MESSAGES/Horde_LoginTasks.mo    |  Bin 385 -> 696 bytes
 framework/LoginTasks/locale/eu/LC_MESSAGES/Horde_LoginTasks.po    |   32 +-
 framework/LoginTasks/package.xml                                  |    4 +-
 framework/Mime/locale/es/LC_MESSAGES/Horde_Mime.mo                |  Bin 1421 -> 1309 bytes
 framework/Mime/locale/es/LC_MESSAGES/Horde_Mime.po                |   29 +-
 framework/Mime/locale/eu/LC_MESSAGES/Horde_Mime.mo                |  Bin 379 -> 1318 bytes
 framework/Mime/locale/eu/LC_MESSAGES/Horde_Mime.po                |   64 +-
 framework/Mime/package.xml                                        |    4 +-
 framework/Mime/test/Horde/Mime/HeadersTest.php                    |    8 +
 framework/Mime/test/Horde/Mime/fixtures/multiple_to.txt           |  142 +
 framework/Mime_Viewer/locale/es/LC_MESSAGES/Horde_Mime_Viewer.mo  |  Bin 1546 -> 1546 bytes
 framework/Mime_Viewer/locale/es/LC_MESSAGES/Horde_Mime_Viewer.po  |    4 +-
 framework/Mime_Viewer/locale/eu/LC_MESSAGES/Horde_Mime_Viewer.mo  |  Bin 0 -> 1559 bytes
 framework/Mime_Viewer/locale/eu/LC_MESSAGES/Horde_Mime_Viewer.po  |  103 +-
 framework/Mime_Viewer/package.xml                                 |    2 +
 framework/Model/locale/es/LC_MESSAGES/Horde_Model.mo              |  Bin 7104 -> 7104 bytes
 framework/Model/locale/es/LC_MESSAGES/Horde_Model.po              |  234 +-
 framework/Model/locale/eu/LC_MESSAGES/Horde_Model.mo              |  Bin 380 -> 1296 bytes
 framework/Model/locale/eu/LC_MESSAGES/Horde_Model.po              |  613 +-
 framework/Nls/locale/es/LC_MESSAGES/Horde_Nls.mo                  |  Bin 20224 -> 20887 bytes
 framework/Nls/locale/es/LC_MESSAGES/Horde_Nls.po                  |  540 +-
 framework/Nls/locale/eu/LC_MESSAGES/Horde_Nls.mo                  |  Bin 378 -> 592 bytes
 framework/Nls/locale/eu/LC_MESSAGES/Horde_Nls.po                  | 1840 ++-
 framework/Nls/package.xml                                         |    4 +-
 framework/Perms/locale/eu/LC_MESSAGES/Horde_Perms.mo              |  Bin 380 -> 855 bytes
 framework/Perms/locale/eu/LC_MESSAGES/Horde_Perms.po              |   36 +-
 framework/Perms/package.xml                                       |    2 +
 framework/Prefs/lib/Horde/Prefs.php                               |   41 +-
 framework/Prefs/lib/Horde/Prefs/Scope.php                         |    6 +-
 framework/Prefs/locale/es/LC_MESSAGES/Horde_Prefs.mo              |  Bin 980 -> 1076 bytes
 framework/Prefs/locale/es/LC_MESSAGES/Horde_Prefs.po              |   11 +-
 framework/Prefs/locale/eu/LC_MESSAGES/Horde_Prefs.mo              |  Bin 380 -> 1071 bytes
 framework/Prefs/locale/eu/LC_MESSAGES/Horde_Prefs.po              |   50 +-
 framework/Prefs/package.xml                                       |   16 +-
 framework/Push/locale/eu/LC_MESSAGES/Horde_Push.mo                |  Bin 0 -> 487 bytes
 framework/Push/locale/eu/LC_MESSAGES/Horde_Push.po                |   42 +
 framework/Push/package.xml                                        |    2 +
 framework/Rpc/locale/es/LC_MESSAGES/Horde_Rpc.mo                  |  Bin 1324 -> 1524 bytes
 framework/Rpc/locale/es/LC_MESSAGES/Horde_Rpc.po                  |    8 +-
 framework/Rpc/locale/eu/LC_MESSAGES/Horde_Rpc.mo                  |  Bin 378 -> 560 bytes
 framework/Rpc/locale/eu/LC_MESSAGES/Horde_Rpc.po                  |   50 +-
 framework/Rpc/package.xml                                         |    4 +-
 .../locale/es/LC_MESSAGES/Horde_Service_Facebook.mo               |  Bin 699 -> 699 bytes
 .../locale/es/LC_MESSAGES/Horde_Service_Facebook.po               |    6 +-
 .../locale/eu/LC_MESSAGES/Horde_Service_Facebook.mo               |  Bin 391 -> 717 bytes
 .../locale/eu/LC_MESSAGES/Horde_Service_Facebook.po               |   21 +-
 framework/Service_Facebook/package.xml                            |    4 +-
 .../Service_Scribd/locale/eu/LC_MESSAGES/Horde_Service_Scribd.mo  |  Bin 389 -> 557 bytes
 .../Service_Scribd/locale/eu/LC_MESSAGES/Horde_Service_Scribd.po  |   16 +-
 framework/Service_Scribd/package.xml                              |    1 +
 .../locale/es/LC_MESSAGES/Horde_Service_Weather.mo                |  Bin 12559 -> 12372 bytes
 .../locale/es/LC_MESSAGES/Horde_Service_Weather.po                |   45 +-
 .../locale/eu/LC_MESSAGES/Horde_Service_Weather.mo                |  Bin 0 -> 782 bytes
 .../locale/eu/LC_MESSAGES/Horde_Service_Weather.po                |  872 +
 framework/Service_Weather/package.xml                             |    4 +-
 framework/Share/locale/eu/LC_MESSAGES/Horde_Share.mo              |  Bin 380 -> 626 bytes
 framework/Share/locale/eu/LC_MESSAGES/Horde_Share.po              |   17 +-
 framework/Share/package.xml                                       |    4 +-
 framework/Support/test/Horde/Support/BacktraceTest.php            |    6 +-
 framework/SyncMl/locale/eu/LC_MESSAGES/Horde_SyncMl.mo            |  Bin 381 -> 565 bytes
 framework/SyncMl/locale/eu/LC_MESSAGES/Horde_SyncMl.po            |   18 +-
 framework/SyncMl/package.xml                                      |    4 +-
 framework/Text_Filter/locale/es/LC_MESSAGES/Horde_Text_Filter.mo  |  Bin 529 -> 529 bytes
 framework/Text_Filter/locale/es/LC_MESSAGES/Horde_Text_Filter.po  |    6 +-
 framework/Text_Filter/locale/eu/LC_MESSAGES/Horde_Text_Filter.mo  |  Bin 386 -> 532 bytes
 framework/Text_Filter/locale/eu/LC_MESSAGES/Horde_Text_Filter.po  |   17 +-
 framework/Text_Filter/package.xml                                 |    4 +-
 framework/Token/locale/eu/LC_MESSAGES/Horde_Token.mo              |  Bin 380 -> 488 bytes
 framework/Token/locale/eu/LC_MESSAGES/Horde_Token.po              |   25 +-
 framework/Token/package.xml                                       |    4 +-
 framework/Util/lib/Horde/String.php                               |   63 +-
 framework/Util/package.xml                                        |   21 +-
 framework/Util/test/Horde/Util/StringTest.php                     |   37 +
 framework/Vfs/locale/es/LC_MESSAGES/Horde_Vfs.mo                  |  Bin 670 -> 670 bytes
 framework/Vfs/locale/es/LC_MESSAGES/Horde_Vfs.po                  |    8 +-
 framework/Vfs/locale/eu/LC_MESSAGES/Horde_Vfs.mo                  |  Bin 378 -> 678 bytes
 framework/Vfs/locale/eu/LC_MESSAGES/Horde_Vfs.po                  |   26 +-
 framework/Vfs/package.xml                                         |    2 +
 gollem/docs/CHANGES                                               |    1 +
 gollem/docs/CREDITS                                               |    2 +-
 gollem/locale/es/LC_MESSAGES/gollem.mo                            |  Bin 75516 -> 73065 bytes
 gollem/locale/eu/LC_MESSAGES/gollem.mo                            |  Bin 168516 -> 72426 bytes
 gollem/locale/eu/LC_MESSAGES/gollem.po                            |  391 +-
 gollem/locale/eu/help.xml                                         |   48 +-
 gollem/package.xml                                                |    2 +
 hermes/entry.php                                                  |    5 +
 hermes/index.php                                                  |   19 +-
 hermes/js/hermes.js                                               |   17 +-
 hermes/lib/Form/Search.php                                        |    2 +-
 hermes/lib/Hermes.php                                             |   12 +-
 hermes/locale/es/LC_MESSAGES/hermes.mo                            |  Bin 81917 -> 79442 bytes
 hermes/search.php                                                 |    4 +
 hermes/templates/dynamic/search.inc                               |    5 +-
 hermes/themes/default/dynamic/screen.css                          |   10 +-
 horde/docs/CHANGES                                                |    1 +
 horde/docs/CREDITS                                                |    2 +-
 horde/lib/Block/Cloud.php                                         |    2 +-
 horde/locale/es/LC_MESSAGES/horde.mo                              |  Bin 67292 -> 64817 bytes
 horde/locale/es/LC_MESSAGES/horde.po                              | 1623 +-
 horde/locale/eu/LC_MESSAGES/horde.mo                              |  Bin 54594 -> 64314 bytes
 horde/locale/eu/LC_MESSAGES/horde.po                              | 2670 +-
 horde/locale/eu/help.xml                                          |   39 +-
 horde/package.xml                                                 |    2 +
 imp/docs/CHANGES                                                  |   11 +
 imp/docs/CREDITS                                                  |    2 +-
 imp/lib/Compose.php                                               |   38 +-
 imp/lib/Mime/Viewer/Smime.php                                     |   27 +-
 imp/lib/Minimal/Compose.php                                       |    4 +-
 imp/locale/es/LC_MESSAGES/imp.mo                                  |  Bin 186127 -> 178169 bytes
 imp/locale/es/LC_MESSAGES/imp.po                                  | 4521 ++--
 imp/locale/eu/LC_MESSAGES/imp.mo                                  |  Bin 266015 -> 181856 bytes
 imp/locale/eu/LC_MESSAGES/imp.po                                  | 6369 +++--
 imp/locale/eu/help.xml                                            | 1782 +-
 imp/package.xml                                                   |    6 +
 ingo/docs/CHANGES                                                 |    1 +
 ingo/docs/CREDITS                                                 |    2 +-
 ingo/locale/es/LC_MESSAGES/ingo.mo                                |  Bin 85015 -> 83647 bytes
 ingo/locale/es/LC_MESSAGES/ingo.po                                |  525 +-
 ingo/locale/eu/LC_MESSAGES/ingo.mo                                |  Bin 176612 -> 81975 bytes
 ingo/locale/eu/LC_MESSAGES/ingo.po                                |  534 +-
 ingo/locale/eu/help.xml                                           |  193 +-
 ingo/package.xml                                                  |    2 +
 jonah/locale/es/LC_MESSAGES/jonah.mo                              |  Bin 77430 -> 74955 bytes
 klutz/locale/es/LC_MESSAGES/klutz.mo                              |  Bin 72728 -> 70216 bytes
 kronolith/docs/CHANGES                                            |    1 +
 kronolith/docs/CREDITS                                            |    2 +-
 kronolith/locale/es/LC_MESSAGES/kronolith.mo                      |  Bin 127990 -> 125083 bytes
 kronolith/locale/es/LC_MESSAGES/kronolith.po                      | 1830 +-
 kronolith/locale/eu/LC_MESSAGES/kronolith.mo                      |  Bin 197634 -> 124127 bytes
 kronolith/locale/eu/LC_MESSAGES/kronolith.po                      | 3027 ++-
 kronolith/locale/eu/help.xml                                      |  131 +-
 kronolith/package.xml                                             |    2 +
 luxor/locale/es/LC_MESSAGES/luxor.mo                              |  Bin 69225 -> 66774 bytes
 mnemo/data.php                                                    |    2 +-
 mnemo/docs/CHANGES                                                |    2 +
 mnemo/docs/CREDITS                                                |    2 +-
 mnemo/locale/es/LC_MESSAGES/mnemo.mo                              |  Bin 77335 -> 74092 bytes
 mnemo/locale/es/LC_MESSAGES/mnemo.po                              |  312 +-
 mnemo/locale/eu/LC_MESSAGES/mnemo.mo                              |  Bin 168860 -> 74245 bytes
 mnemo/locale/eu/LC_MESSAGES/mnemo.po                              |  395 +-
 mnemo/locale/eu/help.xml                                          |   52 +-
 mnemo/package.xml                                                 |   10 +
 nag/docs/CHANGES                                                  |    6 +
 nag/docs/CREDITS                                                  |    2 +-
 nag/lib/Form/Search.php                                           |    2 +-
 nag/lib/Search.php                                                |   24 +
 nag/lib/TagBrowser.php                                            |   49 +-
 nag/lib/Task.php                                                  |   41 +-
 nag/lib/Ui/VarRenderer/Nag.php                                    |    2 +-
 nag/locale/es/LC_MESSAGES/nag.mo                                  |  Bin 92142 -> 90158 bytes
 nag/locale/es/LC_MESSAGES/nag.po                                  |  943 +-
 nag/locale/eu/LC_MESSAGES/nag.mo                                  |  Bin 180785 -> 88756 bytes
 nag/locale/eu/LC_MESSAGES/nag.po                                  |  899 +-
 nag/locale/eu/help.xml                                            |   18 +-
 nag/package.xml                                                   |   17 +
 nag/templates/quick.inc                                           |    3 +-
 passwd/locale/es/LC_MESSAGES/passwd.mo                            |  Bin 76770 -> 74338 bytes
 passwd/package.xml                                                |   24 +-
 sam/locale/es/LC_MESSAGES/sam.mo                                  |  Bin 71472 -> 68981 bytes
 sesha/lib/Entity/Value.php                                        |    9 +-
 sesha/locale/es/LC_MESSAGES/sesha.mo                              |  Bin 75022 -> 72571 bytes
 skeleton/lib/Application.php                                      |   99 +-
 skeleton/list.php                                                 |   24 +
 skeleton/templates/list.html.php                                  |   36 +
 skeleton/themes/default/graphics/delete.png                       |  Bin 0 -> 412 bytes
 skeleton/themes/default/graphics/user.png                         |  Bin 0 -> 382 bytes
 skeleton/themes/default/screen.css                                |   15 +-
 timeobjects/docs/CHANGES                                          |    1 +
 timeobjects/locale/eu/LC_MESSAGES/timeobjects.mo                  |  Bin 0 -> 64818 bytes
 timeobjects/locale/eu/LC_MESSAGES/timeobjects.po                  |   69 +
 timeobjects/package.xml                                           |    4 +-
 trean/locale/es/LC_MESSAGES/trean.mo                              |  Bin 79922 -> 77487 bytes
 trean/templates/list.html.php                                     |    8 +-
 turba/config/backends.php                                         |    1 -
 turba/docs/CHANGES                                                |    1 +
 turba/docs/CREDITS                                                |    2 +-
 turba/locale/de/LC_MESSAGES/turba.mo                              |  Bin 97106 -> 97100 bytes
 turba/locale/de/LC_MESSAGES/turba.po                              |    6 +-
 turba/locale/es/LC_MESSAGES/turba.mo                              |  Bin 99092 -> 96599 bytes
 turba/locale/es/LC_MESSAGES/turba.po                              |  815 +-
 turba/locale/eu/LC_MESSAGES/turba.mo                              |  Bin 188419 -> 95563 bytes
 turba/locale/eu/LC_MESSAGES/turba.po                              | 1099 +-
 turba/locale/eu/help.xml                                          |   92 +-
 turba/package.xml                                                 |    2 +
 ulaform/locale/es/LC_MESSAGES/ulaform.mo                          |  Bin 73250 -> 70775 bytes
 vilma/locale/es/LC_MESSAGES/vilma.mo                              |  Bin 78627 -> 76176 bytes
 whups/locale/es/LC_MESSAGES/whups.mo                              |  Bin 107568 -> 105164 bytes
 wicked/locale/es/LC_MESSAGES/wicked.mo                            |  Bin 83752 -> 81307 bytes
 310 files changed, 26532 insertions(+), 15576 deletions(-)

http://git.horde.org/horde-git/-/commit/8eabecfdf6929457b74c2cf0c7b2177ea0f70397

-----------------------------------------------------------------------

commit a3b99e231269847c0d8c2101e75f1cac6beb2741
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 20 20:53:00 2012 -0700

    Revert "[mms] All Ingo templates now use Horde_View."
    
    This reverts commit 45c0659206521c4ca067ac08f2f4a8061be26c7c.
    
    Move to a separate ingo_3_1 branch
    
    Conflicts:
    	ingo/docs/CHANGES
    	ingo/package.xml

 ingo/blacklist.php                                |   25 +---
 ingo/docs/CHANGES                                 |    1 -
 ingo/filters.php                                  |   80 +++++----
 ingo/js/blacklist.js                              |   24 +--
 ingo/js/filters.js                                |   11 --
 ingo/js/rule.js                                   |   26 ---
 ingo/js/whitelist.js                              |   11 --
 ingo/lib/Ingo.php                                 |   18 +--
 ingo/package.xml                                  |    9 -
 ingo/rule.php                                     |  190 ++++++++++++--------
 ingo/script.php                                   |   30 ++--
 ingo/templates/basic/blacklist/blacklist.html.php |   57 ------
 ingo/templates/basic/filters/filters.html.php     |  114 ------------
 ingo/templates/basic/menu/menu.html.php           |   13 --
 ingo/templates/basic/rule/rule.html.php           |  200 ---------------------
 ingo/templates/basic/script/script.html.php       |   55 ------
 ingo/templates/basic/whitelist/whitelist.html.php |   33 ----
 ingo/templates/blacklist/blacklist.inc            |   53 ++++++
 ingo/templates/filters/filter-none.inc            |    5 +
 ingo/templates/filters/filter.html                |   33 ++++
 ingo/templates/filters/footer.inc                 |    8 +
 ingo/templates/filters/header.inc                 |   20 ++
 ingo/templates/filters/settings.inc               |   30 +++
 ingo/templates/menu/menu.html                     |   14 ++
 ingo/templates/rule/filter.inc                    |   37 ++++
 ingo/templates/rule/footer.inc                    |   69 +++++++
 ingo/templates/rule/header.inc                    |   47 +++++
 ingo/templates/script/activate.inc                |   39 ++++
 ingo/templates/script/footer.inc                  |    4 +
 ingo/templates/script/header.inc                  |    4 +
 ingo/templates/script/script.inc                  |    4 +
 ingo/templates/whitelist/whitelist.inc            |   34 ++++
 ingo/whitelist.php                                |   22 +--
 33 files changed, 589 insertions(+), 731 deletions(-)
 delete mode 100644 ingo/js/whitelist.js
 delete mode 100644 ingo/templates/basic/blacklist/blacklist.html.php
 delete mode 100644 ingo/templates/basic/filters/filters.html.php
 delete mode 100644 ingo/templates/basic/menu/menu.html.php
 delete mode 100644 ingo/templates/basic/rule/rule.html.php
 delete mode 100644 ingo/templates/basic/script/script.html.php
 delete mode 100644 ingo/templates/basic/whitelist/whitelist.html.php
 create mode 100644 ingo/templates/blacklist/blacklist.inc
 create mode 100644 ingo/templates/filters/filter-none.inc
 create mode 100644 ingo/templates/filters/filter.html
 create mode 100644 ingo/templates/filters/footer.inc
 create mode 100644 ingo/templates/filters/header.inc
 create mode 100644 ingo/templates/filters/settings.inc
 create mode 100644 ingo/templates/menu/menu.html
 create mode 100644 ingo/templates/rule/filter.inc
 create mode 100644 ingo/templates/rule/footer.inc
 create mode 100644 ingo/templates/rule/header.inc
 create mode 100644 ingo/templates/script/activate.inc
 create mode 100644 ingo/templates/script/footer.inc
 create mode 100644 ingo/templates/script/header.inc
 create mode 100644 ingo/templates/script/script.inc
 create mode 100644 ingo/templates/whitelist/whitelist.inc

http://git.horde.org/horde-git/-/commit/a3b99e231269847c0d8c2101e75f1cac6beb2741

-----------------------------------------------------------------------

commit 290a10e378c87010c6bd20251f7c93859a411644
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Dec 23 22:17:14 2012 -0700

    [mms] Use more efficient murmurhash3 to determine changes in compose message that will trigger auto saved drafts.

 imp/compose.php                    |    2 +-
 imp/docs/CHANGES                   |    2 +
 imp/js/compose-dimp.js             |    7 ++-
 imp/js/compose.js                  |    4 +-
 imp/js/murmurhash3.js              |   93 ++++++++++++++++++++++++++++++++++++
 imp/lib/Dynamic/Compose/Common.php |    2 +-
 imp/package.xml                    |    8 ++-
 7 files changed, 110 insertions(+), 8 deletions(-)
 create mode 100644 imp/js/murmurhash3.js

http://git.horde.org/horde-git/-/commit/290a10e378c87010c6bd20251f7c93859a411644

-----------------------------------------------------------------------

commit b195670113f8e9c74bb03db949e738832e503986
Merge: 290a10e 87543f0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Jan 6 14:16:53 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/js/dimpbase.js
    	imp/lib/Dynamic/Mailbox.php
    	imp/package.xml
    	imp/themes/default/dynamic/screen.css

 ansel/locale/sk/LC_MESSAGES/ansel.mo                              |  Bin 103720 -> 104838 bytes
 bundles/groupware/docs/INSTALL                                    |   10 +-
 bundles/webmail/docs/INSTALL                                      |   10 +-
 chora/locale/sk/LC_MESSAGES/chora.mo                              |  Bin 70290 -> 71458 bytes
 framework/ActiveSync/doc/Horde/ActiveSync/TODO                    |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php  |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |   19 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php        |  114 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php        |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Policies.php            |    7 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php  |    3 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php   |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/MeetingResponse.php   |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php   |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php        |   30 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/SendMail.php    |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |   19 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php              |  111 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php          |    2 +
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |   36 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Sync.php                |   55 +-
 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php           |   16 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php       |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php       |    6 +-
 .../Horde/ActiveSync/15_horde_activesync_integerimapuidfield.php  |    3 +-
 framework/ActiveSync/package.xml                                  |  115 +-
 framework/ActiveSync/test/Horde/ActiveSync/CacheTest.php          |   56 +-
 framework/ActiveSync/test/Horde/ActiveSync/FolderSyncTest.php     |  Bin 4449 -> 0 bytes
 framework/ActiveSync/test/Horde/ActiveSync/HordeDriverTest.php    |  346 --
 framework/ActiveSync/test/Horde/ActiveSync/Rfc822Test.php         |   65 +
 framework/ActiveSync/test/Horde/ActiveSync/StateTest/Base.php     |   22 +
 framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/Base.php |   90 +
 .../test/Horde/ActiveSync/StateTest/Sql/Pdo/MysqlTest.php         |   25 +
 framework/ActiveSync/test/Horde/ActiveSync/conf.php.dist          |   24 +
 .../test/Horde/ActiveSync/fixtures/FolderSyncRequest.txt          |  Bin 13 -> 0 bytes
 .../test/Horde/ActiveSync/fixtures/default_policies.wbxml         |  Bin 66 -> 30 bytes
 .../test/Horde/ActiveSync/fixtures/default_policies.xml           |  Bin 745 -> 129 bytes
 .../test/Horde/ActiveSync/fixtures/iOSMultipartAlternative.eml    |   29 +
 .../test/Horde/ActiveSync/{137c3bb0-838d-499a-9f0e-fb6c0761da51}1 |    1 -
 framework/Auth/lib/Horde/Auth/Msad.php                            |    2 +-
 framework/Cli/locale/sk/LC_MESSAGES/Horde_Cli.mo                  |  Bin 653 -> 750 bytes
 framework/Cli/locale/sk/LC_MESSAGES/Horde_Cli.po                  |   24 +-
 framework/Controller/lib/Horde/Controller/FilterRunner.php        |    2 +-
 framework/Core/js/hordecore.js                                    |   25 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |  289 +-
 framework/Core/lib/Horde/Core/Script/Package/Datejs.php           |    7 +-
 framework/Core/lib/Horde/Registry.php                             |    1 +
 framework/Core/lib/Horde/Session/Null.php                         |   38 +-
 framework/Core/package.xml                                        |   37 +-
 framework/Crypt/locale/sk/LC_MESSAGES/Horde_Crypt.mo              |  Bin 8534 -> 7402 bytes
 framework/Crypt/locale/sk/LC_MESSAGES/Horde_Crypt.po              |  256 +-
 framework/Data/locale/sk/LC_MESSAGES/Horde_Data.mo                |  Bin 596 -> 1306 bytes
 framework/Data/locale/sk/LC_MESSAGES/Horde_Data.po                |   39 +-
 framework/Form/locale/sk/LC_MESSAGES/Horde_Form.mo                |  Bin 10771 -> 10943 bytes
 framework/Form/locale/sk/LC_MESSAGES/Horde_Form.po                |  307 +-
 framework/Http/lib/Horde/Http/Request/Fopen.php                   |    3 +-
 framework/Http/lib/Horde/Http/Response/Peclhttp.php               |    9 +-
 framework/Image/locale/sk/LC_MESSAGES/Horde_Image.mo              |  Bin 15525 -> 15536 bytes
 framework/Image/locale/sk/LC_MESSAGES/Horde_Image.po              |   30 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |    5 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Catenate.php   |    2 +-
 framework/Imap_Client/package.xml                                 |   23 +-
 framework/Imsp/locale/sk/LC_MESSAGES/Horde_Imsp.mo                |  Bin 641 -> 556 bytes
 framework/Imsp/locale/sk/LC_MESSAGES/Horde_Imsp.po                |   19 +-
 framework/Itip/lib/Horde/Itip/Resource/Identity.php               |    4 +-
 .../Kolab_Resource/locale/sk/LC_MESSAGES/Horde_Kolab_Resource.mo  |  Bin 459 -> 1004 bytes
 .../Kolab_Resource/locale/sk/LC_MESSAGES/Horde_Kolab_Resource.po  |   32 +-
 framework/Ldap/lib/Horde/Ldap/Entry.php                           |    2 +-
 framework/Ldap/lib/Horde/Ldap/Filter.php                          |    8 +-
 framework/Ldap/lib/Horde/Ldap/Ldif.php                            |    2 +-
 framework/Ldap/lib/Horde/Ldap/Schema.php                          |    4 +-
 framework/Ldap/lib/Horde/Ldap/Search.php                          |    2 +-
 framework/Ldap/test/Horde/Ldap/LdifTest.php                       |    8 +-
 framework/Mail/lib/Horde/Mail/Transport/Smtp.php                  |    3 +-
 framework/Mail/package.xml                                        |   21 +-
 framework/Mime/lib/Horde/Mime/Mail.php                            |    2 +
 framework/Mime/lib/Horde/Mime/Part.php                            |    4 +-
 framework/Mime/package.xml                                        |   28 +-
 framework/Mime/test/Horde/Mime/PartTest.php                       |   17 +
 framework/Mime/test/Horde/Mime/fixtures/samplemultipart_msg.txt   |   29 +
 framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php     |    4 +-
 framework/Pear/lib/Horde/Pear/Package/Xml/Contents.php            |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Xml/Directory.php           |    4 +-
 framework/Perms/locale/sk/LC_MESSAGES/Horde_Perms.mo              |  Bin 613 -> 882 bytes
 framework/Perms/locale/sk/LC_MESSAGES/Horde_Perms.po              |   16 +-
 framework/Prefs/locale/sk/LC_MESSAGES/Horde_Prefs.mo              |  Bin 930 -> 1071 bytes
 framework/Prefs/locale/sk/LC_MESSAGES/Horde_Prefs.po              |   21 +-
 framework/Rpc/lib/Horde/Rpc/ActiveSync.php                        |   23 +-
 framework/Rpc/locale/sk/LC_MESSAGES/Horde_Rpc.mo                  |  Bin 1242 -> 1534 bytes
 framework/Rpc/locale/sk/LC_MESSAGES/Horde_Rpc.po                  |   30 +-
 framework/Rpc/package.xml                                         |   23 +-
 .../locale/sk/LC_MESSAGES/Horde_Service_Facebook.mo               |  Bin 670 -> 683 bytes
 .../locale/sk/LC_MESSAGES/Horde_Service_Facebook.po               |   14 +-
 .../Service_Scribd/locale/sk/LC_MESSAGES/Horde_Service_Scribd.mo  |  Bin 459 -> 545 bytes
 .../Service_Scribd/locale/sk/LC_MESSAGES/Horde_Service_Scribd.po  |   12 +-
 framework/Share/lib/Horde/Share/Object.php                        |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Engine/Shell.php          |   22 +-
 framework/Token/locale/sk/LC_MESSAGES/Horde_Token.mo              |  Bin 967 -> 1314 bytes
 framework/Token/locale/sk/LC_MESSAGES/Horde_Token.po              |   24 +-
 framework/Util/test/Horde/Util/StringTest.php                     |    3 +-
 framework/View/lib/Horde/View/Helper/Form.php                     |    2 +-
 gollem/docs/CHANGES                                               |    1 +
 gollem/docs/CREDITS                                               |    1 +
 gollem/lib/Application.php                                        |    4 +-
 gollem/locale/sk/LC_MESSAGES/gollem.mo                            |  Bin 71900 -> 72844 bytes
 gollem/locale/sk/LC_MESSAGES/gollem.po                            |  266 +-
 gollem/manager.php                                                |    2 +-
 gollem/package.xml                                                |    2 +
 hermes/js/hermes.js                                               |   69 +-
 hermes/templates/dynamic/search.inc                               |   16 +-
 horde/.htaccess                                                   |    3 +
 horde/docs/CODING_STANDARDS                                       |    4 +
 horde/docs/INSTALL                                                |   10 +-
 horde/locale/sk/LC_MESSAGES/horde.mo                              |  Bin 63338 -> 64474 bytes
 horde/locale/sk/LC_MESSAGES/horde.po                              |  211 +-
 horde/rpc.php                                                     |    6 +-
 horde/templates/topbar/_menubar.html.php                          |    2 +-
 imp/docs/CHANGES                                                  |    2 +
 imp/js/dimpbase.js                                                |   32 +-
 imp/lib/Compose.php                                               |   17 +-
 imp/lib/Compose/References.php                                    |   61 +
 imp/lib/Dynamic/Mailbox.php                                       |    9 +-
 imp/lib/Mime/Viewer/Smime.php                                     |    2 +-
 imp/locale/sk/LC_MESSAGES/imp.mo                                  |  Bin 177054 -> 178326 bytes
 imp/locale/sk/LC_MESSAGES/imp.po                                  |  710 +++--
 imp/package.xml                                                   |   10 +-
 imp/test/Imp/Unit/ReferencesTest.php                              |   80 +
 imp/themes/default/dynamic/screen.css                             |    4 +
 ingo/locale/sk/LC_MESSAGES/ingo.mo                                |  Bin 82465 -> 83621 bytes
 ingo/locale/sk/LC_MESSAGES/ingo.po                                |   10 +-
 kronolith/lib/Application.php                                     |    8 +-
 kronolith/locale/sk/LC_MESSAGES/kronolith.mo                      |  Bin 123411 -> 124536 bytes
 mnemo/docs/CREDITS                                                |    1 +
 mnemo/locale/sk/LC_MESSAGES/mnemo.mo                              |  Bin 73928 -> 72837 bytes
 mnemo/locale/sk/LC_MESSAGES/mnemo.po                              |  515 ++--
 nag/locale/sk/LC_MESSAGES/nag.mo                                  |  Bin 87322 -> 88448 bytes
 passwd/docs/CREDITS                                               |    1 +
 passwd/locale/sk/LC_MESSAGES/passwd.mo                            |  Bin 72255 -> 70251 bytes
 passwd/locale/sk/LC_MESSAGES/passwd.po                            |  256 +-
 sesha/lib/Application.php                                         |    2 +-
 sesha/list.php                                                    |    4 +-
 trean/bin/trean-backfill-remove-utm-params                        |   28 +
 trean/docs/CHANGES                                                |    3 +
 trean/lib/Api.php                                                 |   72 +
 trean/lib/Queue/Task/Crawl.php                                    |   43 +-
 trean/lib/Url.php                                                 |   22 +
 trean/package.xml                                                 |    4 +
 trean/search.php                                                  |    6 +-
 trean/templates/add.html.php                                      |    2 +-
 turba/docs/CHANGES                                                |    1 +
 turba/lib/Driver.php                                              |   10 +-
 turba/locale/sk/LC_MESSAGES/turba.mo                              |  Bin 94557 -> 95619 bytes
 turba/locale/sk/LC_MESSAGES/turba.po                              |   68 +-
 turba/package.xml                                                 |    2 +
 whups/docs/CHANGES                                                |    1 +
 whups/package.xml                                                 |    1 +
 whups/search.php                                                  |    2 +-
 wicked/docs/CREDITS                                               |    1 +
 wicked/locale/sk/LC_MESSAGES/wicked.mo                            |  Bin 78042 -> 78902 bytes
 wicked/locale/sk/LC_MESSAGES/wicked.po                            |  237 +-
 161 files changed, 3067 insertions(+), 2493 deletions(-)

http://git.horde.org/horde-git/-/commit/b195670113f8e9c74bb03db949e738832e503986

-----------------------------------------------------------------------

commit d50b5e51980177da42e86ad38ebe589fac015596
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Jan 6 14:18:47 2013 -0700

    Bug #11925: Translation fixes

 imp/js/dimpbase.js          |   46 ++++++++++++++++--------------------------
 imp/lib/Dynamic/Mailbox.php |    9 ++++---
 2 files changed, 23 insertions(+), 32 deletions(-)

http://git.horde.org/horde-git/-/commit/d50b5e51980177da42e86ad38ebe589fac015596

-----------------------------------------------------------------------

commit 87063e1a2dd23c91bf3a2dba252e74aad3326e65
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 7 11:59:09 2013 -0700

    Fix scrolling in dynamic thread view popup

 imp/themes/default/dynamic/screen.css |    3 +++
 imp/thread.php                        |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/87063e1a2dd23c91bf3a2dba252e74aad3326e65

-----------------------------------------------------------------------

commit f494820ac142ee7bb43a9a4810ec2f1d81b76dab
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 7 16:34:06 2013 -0700

    Merge IMP_Mailbox_List and IMP_Mailbox_List_Track

 imp/lib/Factory/MailboxList.php |   66 ++++-------
 imp/lib/Indices.php             |   13 +-
 imp/lib/Mailbox/List.php        |  239 +++++++++++++++++++++++++++++++++--
 imp/lib/Mailbox/List/Track.php  |  262 ---------------------------------------
 imp/package.xml                 |    6 +-
 imp/thread.php                  |   10 +-
 6 files changed, 266 insertions(+), 330 deletions(-)
 delete mode 100644 imp/lib/Mailbox/List/Track.php

http://git.horde.org/horde-git/-/commit/f494820ac142ee7bb43a9a4810ec2f1d81b76dab

-----------------------------------------------------------------------

commit 9de5543dad6d0d159844ebc1ec75213ccd248f2a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 7 17:16:18 2013 -0700

    Remove IMP_Mailbox_List#getIMAPIndex()
    
    It is duplicative of the array access to the object.
    Also, IMP_Mailbox_List#getMessageIndex() -> IMP_Mailbox_List#getIndex()

 imp/lib/Indices.php             |    4 ++--
 imp/lib/Mailbox/List.php        |   31 +++----------------------------
 imp/lib/Minimal/Message.php     |   22 +++++++++++-----------
 imp/lib/Minimal/Messagepart.php |    6 +++---
 imp/message.php                 |   30 +++++++++++++++---------------
 imp/thread.php                  |    4 ++--
 6 files changed, 36 insertions(+), 61 deletions(-)

http://git.horde.org/horde-git/-/commit/9de5543dad6d0d159844ebc1ec75213ccd248f2a

-----------------------------------------------------------------------

commit 0534bc74759f1addcf3669b98921aa3d0f4e350a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 7 17:26:08 2013 -0700

    Move search related code from IMP_Mailbox_List to extended IMP_Mailbox_List_Virtual class

 imp/lib/Factory/MailboxList.php  |    7 +-
 imp/lib/Mailbox/List.php         |  156 +++++++++++++++---------------------
 imp/lib/Mailbox/List/Virtual.php |  164 ++++++++++++++++++++++++++++++++++++++
 imp/package.xml                  |    4 +-
 4 files changed, 235 insertions(+), 96 deletions(-)
 create mode 100644 imp/lib/Mailbox/List/Virtual.php

http://git.horde.org/horde-git/-/commit/0534bc74759f1addcf3669b98921aa3d0f4e350a

-----------------------------------------------------------------------

commit 52d5686eb26f9c6171e2c4a1e3550b4504a7800c
Merge: 0534bc7 e531e9c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 8 16:12:14 2013 -0700

    Merge branch 'master' into imp_6_1

 components/data/distribute/debian/templates-php-horde-ansel/rules |   16 ++
 .../data/distribute/debian/templates-php-horde-content/rules      |    6 +-
 .../data/distribute/debian/templates-php-horde-gollem/rules       |   16 ++
 .../data/distribute/debian/templates-php-horde-groupware/rules    |   13 +-
 components/data/distribute/debian/templates-php-horde-imp/rules   |    6 +-
 components/data/distribute/debian/templates-php-horde-ingo/rules  |    6 +-
 components/data/distribute/debian/templates-php-horde-jonah/rules |    6 +-
 .../distribute/debian/templates-php-horde-kolab-webmail/rules     |   30 ++--
 .../data/distribute/debian/templates-php-horde-kronolith/rules    |    6 +-
 components/data/distribute/debian/templates-php-horde-mnemo/rules |    6 +-
 components/data/distribute/debian/templates-php-horde-nag/rules   |    6 +-
 .../data/distribute/debian/templates-php-horde-passwd/rules       |    6 +-
 components/data/distribute/debian/templates-php-horde-sesha/rules |   16 ++
 components/data/distribute/debian/templates-php-horde-turba/rules |    6 +-
 .../data/distribute/debian/templates-php-horde-ulaform/rules      |    6 +-
 .../data/distribute/debian/templates-php-horde-webmail/rules      |   17 +--
 components/data/distribute/debian/templates-php-horde-whups/rules |   16 ++
 .../data/distribute/debian/templates-php-horde-wicked/rules       |    6 +-
 components/data/distribute/debian/templates-php-horde/rules       |    6 +-
 components/data/distribute/debian/templates/changelog             |    2 +-
 components/data/distribute/debian/templates/control               |    4 +-
 components/data/distribute/debian/templates/pearrc                |    2 +-
 components/data/distribute/debian/templates/watch                 |    4 +-
 components/package.xml                                            |    2 +-
 .../test/distribute/debian/templates-php-horde-content/rules      |    6 +-
 .../Components/test/distribute/debian/templates-php-horde/rules   |    6 +-
 framework/ActiveSync/package.xml                                  |    6 +-
 framework/Core/lib/Horde/Core/Prefs/Identity.php                  |    6 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Event.php       |    1 +
 framework/Routes/lib/Horde/Routes/Mapper.php                      |    2 +-
 framework/Routes/package.xml                                      |    4 +-
 framework/Util/test/Horde/Util/StringTest.php                     |    3 +-
 horde/docs/CHANGES                                                |    1 +
 horde/js/topbar.js                                                |    6 +-
 horde/lib/View/Topbar.php                                         |    2 +-
 horde/package.xml                                                 |    6 +
 imp/lib/Ajax/Application/ListMessages.php                         |    4 +-
 imp/lib/Mime/Viewer/Related.php                                   |    6 +-
 ingo/vacation.php                                                 |    2 +-
 koward/package.xml                                                |    2 +-
 kronolith/docs/CHANGES                                            |    4 +
 kronolith/lib/Driver/Ical.php                                     |    3 +-
 kronolith/lib/Event/Kolab.php                                     |    7 +
 kronolith/new.php                                                 |    6 +-
 kronolith/package.xml                                             |    4 +
 passwd/templates/index.html.php                                   |    2 +-
 sesha/lib/Entity/Value.php                                        |   37 +++--
 turba/locale/de/LC_MESSAGES/turba.po                              |    2 +-
 48 files changed, 221 insertions(+), 117 deletions(-)

http://git.horde.org/horde-git/-/commit/52d5686eb26f9c6171e2c4a1e3550b4504a7800c

-----------------------------------------------------------------------

commit 04033c3fe81ef1f1a387772cd8fc0b3b4a50b6bc
Merge: 52d5686 60a0341
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 9 15:16:49 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Mailbox/List/Track.php
    
    Also removed some call-time pass-by-reference which was causing the
    PHP commit check to fatally fail (I recently switched to PHP 5.4).

 ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.h         |    2 +-
 ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m         |    2 +-
 ApertureToAnselExportPlugin/COPYING                               |    2 +-
 ApertureToAnselExportPlugin/TURAnselKit/AnselGalleryViewItem.h    |    2 +-
 ApertureToAnselExportPlugin/TURAnselKit/AnselGalleryViewItem.m    |    2 +-
 ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.h                |    2 +-
 ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.m                |    2 +-
 ApertureToAnselExportPlugin/TURAnselKit/TURAnselConstants.h       |    2 +-
 ApertureToAnselExportPlugin/TURAnselKit/TURAnselConstants.m       |    2 +-
 ApertureToAnselExportPlugin/TURAnselKit/TURAnselGallery.h         |    2 +-
 ApertureToAnselExportPlugin/TURAnselKit/TURAnselGallery.m         |    2 +-
 .../TURAnselKit/TURAnselGalleryPanelController.h                  |    2 +-
 .../TURAnselKit/TURAnselGalleryPanelController.m                  |    2 +-
 Dashboard/KeychainPlugin/KeychainPlugIn.h                         |    2 +-
 Dashboard/KeychainPlugin/KeychainPlugIn.m                         |    2 +-
 Dashboard/KeychainPlugin/KeychainPlugIn_Prefix.pch                |    2 +-
 agora/ban.php                                                     |    2 +-
 agora/deleteforum.php                                             |    2 +-
 agora/editforum.php                                               |    2 +-
 agora/forums.php                                                  |    2 +-
 agora/lib/Agora.php                                               |    2 +-
 agora/lib/Api.php                                                 |    2 +-
 agora/lib/Application.php                                         |    2 +-
 agora/lib/Block/Forums.php                                        |    2 +-
 agora/lib/Block/Thread.php                                        |    2 +-
 agora/lib/Block/Threads.php                                       |    2 +-
 agora/lib/Comments.php                                            |    2 +-
 agora/lib/Driver.php                                              |    2 +-
 agora/lib/Driver/SplitSql.php                                     |    2 +-
 agora/lib/Driver/Sql.php                                          |    2 +-
 agora/lib/Exception.php                                           |    2 +-
 agora/lib/Factory/Driver.php                                      |    2 +-
 agora/lib/Form/Forum.php                                          |    2 +-
 agora/lib/Form/Message.php                                        |    2 +-
 agora/lib/Form/Search.php                                         |    2 +-
 agora/lib/Tree/Flat.php                                           |    2 +-
 agora/lib/View.php                                                |    2 +-
 agora/locale/de/LC_MESSAGES/agora.po                              |    2 +-
 agora/locale/es/LC_MESSAGES/agora.po                              |    2 +-
 agora/locale/fr/LC_MESSAGES/agora.po                              |    2 +-
 agora/locale/hu/LC_MESSAGES/agora.po                              |    2 +-
 agora/locale/it/LC_MESSAGES/agora.po                              |    2 +-
 agora/locale/ja/LC_MESSAGES/agora.po                              |    2 +-
 agora/locale/lt/LC_MESSAGES/agora.po                              |    2 +-
 agora/locale/lv/LC_MESSAGES/agora.po                              |    2 +-
 agora/locale/ro/LC_MESSAGES/agora.po                              |    2 +-
 agora/locale/sl/LC_MESSAGES/agora.po                              |    2 +-
 agora/messages/abuse.php                                          |    2 +-
 agora/messages/delete.php                                         |    2 +-
 agora/messages/edit.php                                           |    2 +-
 agora/messages/index.php                                          |    2 +-
 agora/messages/lock.php                                           |    2 +-
 agora/messages/merge.php                                          |    2 +-
 agora/messages/move.php                                           |    2 +-
 agora/messages/split.php                                          |    2 +-
 agora/migration/1_agora_base_tables.php                           |    2 +-
 agora/migration/2_agora_upgrade_autoincrement.php                 |    2 +-
 agora/moderate.php                                                |    2 +-
 agora/moderators.php                                              |    2 +-
 agora/owner.php                                                   |    2 +-
 agora/rss/index.php                                               |    2 +-
 agora/rss/messages.php                                            |    2 +-
 agora/rss/threads.php                                             |    2 +-
 agora/search.php                                                  |    2 +-
 agora/threads.php                                                 |    2 +-
 agora/view.php                                                    |    2 +-
 ansel/browse.php                                                  |    2 +-
 ansel/browse_edit.php                                             |    2 +-
 ansel/disclamer.php                                               |    2 +-
 ansel/edit_dates.php                                              |    2 +-
 ansel/faces/claim.php                                             |    2 +-
 ansel/faces/custom.php                                            |    2 +-
 ansel/faces/face.php                                              |    2 +-
 ansel/faces/gallery.php                                           |    2 +-
 ansel/faces/image.php                                             |    2 +-
 ansel/faces/img.php                                               |    2 +-
 ansel/faces/name.php                                              |    2 +-
 ansel/faces/report.php                                            |    2 +-
 ansel/faces/savecustom.php                                        |    2 +-
 ansel/faces/search/all.php                                        |    2 +-
 ansel/faces/search/image.php                                      |    2 +-
 ansel/faces/search/image_define.php                               |    2 +-
 ansel/faces/search/image_save.php                                 |    2 +-
 ansel/faces/search/image_search.php                               |    2 +-
 ansel/faces/search/img.php                                        |    2 +-
 ansel/faces/search/name.php                                       |    2 +-
 ansel/faces/search/named.php                                      |    2 +-
 ansel/faces/search/owner.php                                      |    2 +-
 ansel/faces/search/tabs.php                                       |    2 +-
 ansel/gallery.php                                                 |    2 +-
 ansel/gallery/captions.php                                        |    2 +-
 ansel/gallery/delete.php                                          |    2 +-
 ansel/gallery/sort.php                                            |    2 +-
 ansel/group.php                                                   |    2 +-
 ansel/image.php                                                   |    2 +-
 ansel/img/download.php                                            |    2 +-
 ansel/img/ecard.php                                               |    2 +-
 ansel/img/full.php                                                |    2 +-
 ansel/img/index.php                                               |    2 +-
 ansel/img/mini.php                                                |    2 +-
 ansel/img/screen.php                                              |    2 +-
 ansel/img/thumb.php                                               |    2 +-
 ansel/img/upload.php                                              |    2 +-
 ansel/img/upload_preview.php                                      |    2 +-
 ansel/index.php                                                   |    2 +-
 ansel/js/map.js                                                   |    2 +-
 ansel/js/map_edit.js                                              |    2 +-
 ansel/js/smartmobile.js                                           |    2 +-
 ansel/js/widgets/geotag.js                                        |    2 +-
 ansel/lib/Ajax/Application.php                                    |    2 +-
 ansel/lib/Ajax/Application/Handler.php                            |    2 +-
 ansel/lib/Ajax/Imple/EditCaption.php                              |    2 +-
 ansel/lib/Ajax/Imple/EditFaces.php                                |    2 +-
 ansel/lib/Ajax/Imple/LocationAutoCompleter.php                    |    2 +-
 ansel/lib/Ajax/Imple/ToggleGalleryActions.php                     |    2 +-
 ansel/lib/Ajax/Imple/ToggleOtherGalleries.php                     |    2 +-
 ansel/lib/Ansel.php                                               |    2 +-
 ansel/lib/Api.php                                                 |    2 +-
 ansel/lib/Application.php                                         |    2 +-
 ansel/lib/Block/Cloud.php                                         |    2 +-
 ansel/lib/Block/Gallery.php                                       |    2 +-
 ansel/lib/Block/MyGalleries.php                                   |    2 +-
 ansel/lib/Block/RecentComments.php                                |    2 +-
 ansel/lib/Block/RecentFaces.php                                   |    2 +-
 ansel/lib/Block/RecentlyAdded.php                                 |    2 +-
 ansel/lib/Block/RecentlyAddedGeodata.php                          |    2 +-
 ansel/lib/Exception.php                                           |    2 +-
 ansel/lib/Faces.php                                               |    2 +-
 ansel/lib/Faces/Base.php                                          |    2 +-
 ansel/lib/Factory/Storage.php                                     |    2 +-
 ansel/lib/Form/Image.php                                          |    2 +-
 ansel/lib/Form/ImageDate.php                                      |    2 +-
 ansel/lib/Form/Watermark.php                                      |    2 +-
 ansel/lib/Gallery.php                                             |    2 +-
 ansel/lib/Gallery/Decorator/Date.php                              |    2 +-
 ansel/lib/GalleryMode/Base.php                                    |    2 +-
 ansel/lib/GalleryMode/Date.php                                    |    2 +-
 ansel/lib/GalleryMode/Normal.php                                  |    2 +-
 ansel/lib/Image.php                                               |    2 +-
 ansel/lib/ImageGenerator.php                                      |    2 +-
 ansel/lib/ImageGenerator/Mini.php                                 |    2 +-
 ansel/lib/ImageGenerator/SquareThumb.php                          |    2 +-
 ansel/lib/LoginTasks/SystemTask/Upgrade.php                       |    2 +-
 ansel/lib/Prefs/Special/GallerySelect.php                         |    2 +-
 ansel/lib/Prefs/Special/GalleryStyle.php                          |    2 +-
 ansel/lib/Queue/ProcessThumbs.php                                 |    2 +-
 ansel/lib/Report.php                                              |    4 +-
 ansel/lib/Search.php                                              |    2 +-
 ansel/lib/Search/Tag.php                                          |    2 +-
 ansel/lib/Search/exif.php                                         |    2 +-
 ansel/lib/Storage.php                                             |    2 +-
 ansel/lib/Tagger.php                                              |    2 +-
 ansel/lib/Test.php                                                |    2 +-
 ansel/lib/View/Ansel.php                                          |    2 +-
 ansel/lib/View/Base.php                                           |    2 +-
 ansel/lib/View/EmbeddedRenderer/GalleryLink.php                   |    2 +-
 ansel/lib/View/EmbeddedRenderer/Mini.php                          |    2 +-
 ansel/lib/View/EmbeddedRenderer/Slideshow.php                     |    2 +-
 ansel/lib/View/GalleryProperties.php                              |    2 +-
 ansel/lib/View/GalleryRenderer/Base.php                           |    2 +-
 ansel/lib/View/GalleryRenderer/Gallery.php                        |    2 +-
 ansel/lib/View/GalleryRenderer/GalleryLightbox.php                |    2 +-
 ansel/lib/View/List.php                                           |    2 +-
 ansel/lib/View/Results.php                                        |    2 +-
 ansel/lib/View/Upload.php                                         |    2 +-
 ansel/lib/Widget.php                                              |    2 +-
 ansel/lib/Widget/Actions.php                                      |    2 +-
 ansel/lib/Widget/Base.php                                         |    2 +-
 ansel/lib/Widget/GalleryFaces.php                                 |    2 +-
 ansel/lib/Widget/Geotag.php                                       |    2 +-
 ansel/lib/Widget/ImageFaces.php                                   |    2 +-
 ansel/lib/Widget/OtherGalleries.php                               |    4 +-
 ansel/locale/de/LC_MESSAGES/ansel.po                              |    2 +-
 ansel/locale/es/LC_MESSAGES/ansel.po                              |    2 +-
 ansel/locale/fr/LC_MESSAGES/ansel.po                              |    2 +-
 ansel/locale/it/LC_MESSAGES/ansel.po                              |    2 +-
 ansel/locale/ja/LC_MESSAGES/ansel.po                              |    2 +-
 ansel/locale/lt/LC_MESSAGES/ansel.po                              |    2 +-
 ansel/locale/lv/LC_MESSAGES/ansel.po                              |    2 +-
 ansel/locale/sk/LC_MESSAGES/ansel.po                              |    2 +-
 ansel/locale/sl/LC_MESSAGES/ansel.po                              |    2 +-
 ansel/locale/tr/LC_MESSAGES/ansel.po                              |    2 +-
 ansel/map_edit.php                                                |    2 +-
 ansel/migration/10_ansel_upgrade_computestylehashes.php           |    2 +-
 ansel/migration/1_ansel_base_tables.php                           |    2 +-
 ansel/migration/2_ansel_upgrade_autoincrement.php                 |    2 +-
 ansel/migration/3_ansel_upgrade_style.php                         |    2 +-
 ansel/migration/4_ansel_upgrade_tagstocontent.php                 |    2 +-
 ansel/migration/5_ansel_upgrade_categoriestotags.php              |    2 +-
 ansel/migration/6_ansel_upgrade_unsignedints.php                  |    2 +-
 ansel/migration/7_ansel_upgrade_stylefix.php                      |    2 +-
 ansel/migration/8_ansel_upgrade_sqlhierarchical.php               |    2 +-
 ansel/migration/9_ansel_upgrade_sqlng.php                         |    2 +-
 ansel/perms.php                                                   |    2 +-
 ansel/preview.php                                                 |    2 +-
 ansel/protect.php                                                 |    2 +-
 ansel/report.php                                                  |    2 +-
 ansel/rss.php                                                     |    2 +-
 ansel/smartmobile.php                                             |    2 +-
 ansel/test/Ansel/TestCase.php                                     |    2 +-
 ansel/test/Ansel/Unit/Base.php                                    |    2 +-
 ansel/test/Ansel/Unit/ImageTest.php                               |    2 +-
 ansel/view.php                                                    |    2 +-
 ansel/xppublish.php                                               |    2 +-
 beatnik/autogenerate.php                                          |    2 +-
 beatnik/commit.php                                                |    4 +-
 beatnik/config/autogenerate.php.dist                              |    8 -
 beatnik/delete.php                                                |    2 +-
 beatnik/editrec.php                                               |    4 +-
 beatnik/index.php                                                 |    4 +-
 beatnik/lib/Application.php                                       |    2 +-
 beatnik/lib/Driver/pdnsgsql.php                                   |    2 +-
 beatnik/lib/Driver/sql.php                                        |    2 +-
 beatnik/listzones.php                                             |    4 +-
 beatnik/locale/fi/LC_MESSAGES/beatnik.po                          |    2 +-
 beatnik/locale/lv/LC_MESSAGES/beatnik.po                          |    2 +-
 beatnik/locale/sl/LC_MESSAGES/beatnik.po                          |    2 +-
 beatnik/scripts/export_config.php                                 |    2 +-
 beatnik/templates/listzones/footer.inc                            |    8 -
 beatnik/templates/listzones/header.inc                            |    9 -
 beatnik/templates/listzones/row.inc                               |    9 -
 beatnik/templates/menu.inc                                        |    4 +-
 beatnik/templates/view/footer.inc                                 |    8 -
 beatnik/templates/view/header.inc                                 |    7 -
 beatnik/templates/view/record.inc                                 |    6 -
 beatnik/viewzone.php                                              |    4 +-
 bundles/groupware/lib/Bundle.php                                  |    2 +-
 bundles/kolab_webmail/lib/Bundle.php                              |    2 +-
 bundles/webmail/lib/Bundle.php                                    |    2 +-
 chora/annotate.php                                                |    2 +-
 chora/app/helpers/Diff.php                                        |    2 +-
 chora/browsedir.php                                               |    2 +-
 chora/browsefile.php                                              |    2 +-
 chora/co.php                                                      |    2 +-
 chora/commit.php                                                  |    2 +-
 chora/cvsgraph.php                                                |    2 +-
 chora/diff.php                                                    |    2 +-
 chora/history.php                                                 |    2 +-
 chora/index.php                                                   |    2 +-
 chora/lib/Application.php                                         |    2 +-
 chora/lib/Chora.php                                               |    2 +-
 chora/lib/Exception.php                                           |    2 +-
 chora/lib/Readme/Collection.php                                   |    2 +-
 chora/lib/Renderer/File.php                                       |    2 +-
 chora/lib/Renderer/File/Html.php                                  |    2 +-
 chora/lib/Renderer/File/Plain.php                                 |    2 +-
 chora/lib/Test.php                                                |    2 +-
 chora/locale/cs/LC_MESSAGES/chora.po                              |    2 +-
 chora/locale/da/LC_MESSAGES/chora.po                              |    2 +-
 chora/locale/de/LC_MESSAGES/chora.po                              |    2 +-
 chora/locale/es/LC_MESSAGES/chora.po                              |    2 +-
 chora/locale/it/LC_MESSAGES/chora.po                              |    2 +-
 chora/locale/lv/LC_MESSAGES/chora.po                              |    2 +-
 chora/locale/ro/LC_MESSAGES/chora.po                              |    2 +-
 chora/locale/ru/LC_MESSAGES/chora.po                              |    4 +-
 chora/locale/sk/LC_MESSAGES/chora.po                              |    2 +-
 chora/locale/zh_CN/LC_MESSAGES/chora.po                           |    2 +-
 chora/patchsets.php                                               |    2 +-
 chora/stats.php                                                   |    2 +-
 components/lib/Components.php                                     |    2 +-
 components/lib/Components/Component.php                           |    2 +-
 components/lib/Components/Component/Archive.php                   |    2 +-
 components/lib/Components/Component/Base.php                      |    2 +-
 components/lib/Components/Component/Dependency.php                |    2 +-
 components/lib/Components/Component/DependencyList.php            |    2 +-
 components/lib/Components/Component/Factory.php                   |    2 +-
 components/lib/Components/Component/Identify.php                  |    2 +-
 components/lib/Components/Component/Match.php                     |    2 +-
 components/lib/Components/Component/Remote.php                    |    2 +-
 components/lib/Components/Component/Resolver.php                  |    2 +-
 components/lib/Components/Component/Source.php                    |    2 +-
 components/lib/Components/Config.php                              |    2 +-
 components/lib/Components/Config/Application.php                  |    2 +-
 components/lib/Components/Config/Base.php                         |    2 +-
 components/lib/Components/Config/Bootstrap.php                    |    2 +-
 components/lib/Components/Config/Cli.php                          |    2 +-
 components/lib/Components/Config/File.php                         |    2 +-
 components/lib/Components/Configs.php                             |    2 +-
 components/lib/Components/Constants.php                           |    2 +-
 components/lib/Components/Dependencies.php                        |    2 +-
 components/lib/Components/Dependencies/Bootstrap.php              |    2 +-
 components/lib/Components/Dependencies/Injector.php               |    2 +-
 components/lib/Components/Exception.php                           |    2 +-
 components/lib/Components/Exception/Pear.php                      |    2 +-
 components/lib/Components/Helper/ChangeLog.php                    |    2 +-
 components/lib/Components/Helper/Commit.php                       |    2 +-
 components/lib/Components/Helper/Dependencies.php                 |    2 +-
 components/lib/Components/Helper/DocsOrigin.php                   |    2 +-
 components/lib/Components/Helper/Installer.php                    |    2 +-
 components/lib/Components/Helper/Root.php                         |    2 +-
 components/lib/Components/Helper/Template.php                     |    2 +-
 components/lib/Components/Helper/Templates.php                    |    2 +-
 components/lib/Components/Helper/Templates/Directory.php          |    2 +-
 components/lib/Components/Helper/Templates/RecursiveDirectory.php |    2 +-
 components/lib/Components/Helper/Templates/Single.php             |    2 +-
 components/lib/Components/Helper/Version.php                      |    2 +-
 components/lib/Components/Helper/Website.php                      |    2 +-
 components/lib/Components/Module.php                              |    2 +-
 components/lib/Components/Module/Base.php                         |    2 +-
 components/lib/Components/Module/Change.php                       |    2 +-
 components/lib/Components/Module/CiSetup.php                      |    2 +-
 components/lib/Components/Module/Dependencies.php                 |    2 +-
 components/lib/Components/Module/Distribute.php                   |    2 +-
 components/lib/Components/Module/Fetchdocs.php                    |    2 +-
 components/lib/Components/Module/Help.php                         |    2 +-
 components/lib/Components/Module/Installer.php                    |    2 +-
 components/lib/Components/Module/Qc.php                           |    2 +-
 components/lib/Components/Module/Release.php                      |    2 +-
 components/lib/Components/Module/Snapshot.php                     |    2 +-
 components/lib/Components/Module/Update.php                       |    2 +-
 components/lib/Components/Module/Webdocs.php                      |    2 +-
 components/lib/Components/Output.php                              |    2 +-
 components/lib/Components/Pear/Environment.php                    |    2 +-
 components/lib/Components/Pear/Factory.php                        |    2 +-
 components/lib/Components/Pear/Package.php                        |    2 +-
 components/lib/Components/Qc/Task/Base.php                        |    2 +-
 components/lib/Components/Qc/Task/Cpd.php                         |    2 +-
 components/lib/Components/Qc/Task/Cs.php                          |    2 +-
 components/lib/Components/Qc/Task/Lint.php                        |    2 +-
 components/lib/Components/Qc/Task/Md.php                          |    2 +-
 components/lib/Components/Qc/Task/Unit.php                        |    2 +-
 components/lib/Components/Qc/Tasks.php                            |    2 +-
 components/lib/Components/Release/Notes.php                       |    2 +-
 components/lib/Components/Release/Task/Announce.php               |    2 +-
 components/lib/Components/Release/Task/Base.php                   |    2 +-
 components/lib/Components/Release/Task/Bugs.php                   |    2 +-
 components/lib/Components/Release/Task/CommitPostRelease.php      |    2 +-
 components/lib/Components/Release/Task/CommitPreRelease.php       |    2 +-
 components/lib/Components/Release/Task/CurrentSentinel.php        |    2 +-
 components/lib/Components/Release/Task/Freecode.php               |    2 +-
 components/lib/Components/Release/Task/NextSentinel.php           |    2 +-
 components/lib/Components/Release/Task/NextVersion.php            |    2 +-
 components/lib/Components/Release/Task/Package.php                |    2 +-
 components/lib/Components/Release/Task/Sentinel.php               |    2 +-
 components/lib/Components/Release/Task/TagRelease.php             |    2 +-
 components/lib/Components/Release/Task/Timestamp.php              |    2 +-
 components/lib/Components/Release/Tasks.php                       |    2 +-
 components/lib/Components/Runner/Change.php                       |    2 +-
 components/lib/Components/Runner/CiPrebuild.php                   |    2 +-
 components/lib/Components/Runner/CiSetup.php                      |    2 +-
 components/lib/Components/Runner/Dependencies.php                 |    2 +-
 components/lib/Components/Runner/Distribute.php                   |    2 +-
 components/lib/Components/Runner/Fetchdocs.php                    |    2 +-
 components/lib/Components/Runner/Installer.php                    |    2 +-
 components/lib/Components/Runner/Qc.php                           |    2 +-
 components/lib/Components/Runner/Release.php                      |    2 +-
 components/lib/Components/Runner/Snapshot.php                     |    2 +-
 components/lib/Components/Runner/Update.php                       |    2 +-
 components/lib/Components/Runner/Webdocs.php                      |    2 +-
 components/test/Components/Autoload.php                           |    2 +-
 .../test/Components/Integration/Components/Module/CiSetupTest.php |    2 +-
 .../Components/Integration/Components/Module/DistributeTest.php   |    2 +-
 .../Components/Integration/Components/Module/DocumentTest.php     |    2 +-
 .../Components/Integration/Components/Module/InstallerTest.php    |    2 +-
 .../test/Components/Integration/Components/Module/ReleaseTest.php |    2 +-
 components/test/Components/StoryTestCase.php                      |    2 +-
 components/test/Components/TestCase.php                           |    2 +-
 .../Components/Unit/Components/Component/DependencyListTest.php   |    2 +-
 .../test/Components/Unit/Components/Component/DependencyTest.php  |    2 +-
 .../test/Components/Unit/Components/Component/IdentifyTest.php    |    2 +-
 .../test/Components/Unit/Components/Component/ResolverTest.php    |    2 +-
 components/test/Components/Unit/Components/Config/FileTest.php    |    2 +-
 components/test/Components/Unit/Components/ConfigsTest.php        |    2 +-
 .../test/Components/Unit/Components/Helper/DocsOriginTest.php     |    2 +-
 components/test/Components/Unit/Components/Helper/RootTest.php    |    2 +-
 .../test/Components/Unit/Components/Helper/TemplatesTest.php      |    2 +-
 .../Components/Unit/Components/Helper/VersionDescriptionTest.php  |    2 +-
 .../Components/Unit/Components/Helper/VersionStabilityTest.php    |    2 +-
 components/test/Components/Unit/Components/Helper/VersionTest.php |    2 +-
 .../test/Components/Unit/Components/Module/DependenciesTest.php   |    2 +-
 .../test/Components/Unit/Components/Module/SnapshotTest.php       |    2 +-
 components/test/Components/Unit/Components/Module/UpdateTest.php  |    2 +-
 .../Unit/Components/Release/Task/CurrentSentinelTest.php          |    2 +-
 .../Components/Unit/Components/Release/Task/NextSentinelTest.php  |    2 +-
 .../test/Components/Unit/Components/Release/Task/PackageTest.php  |    2 +-
 .../Components/Unit/Components/Release/Task/TimestampTest.php     |    2 +-
 components/test/Components/Unit/ComponentsTest.php                |    2 +-
 content/bin/content-object-add                                    |    2 +-
 content/bin/content-object-delete                                 |    2 +-
 content/bin/content-tag                                           |    2 +-
 content/bin/content-tag-add                                       |    2 +-
 content/bin/content-tag-delete                                    |    2 +-
 content/bin/content-untag                                         |    2 +-
 content/lib/Application.php                                       |    2 +-
 content/lib/Indexer.php                                           |    2 +-
 content/lib/Objects/Manager.php                                   |    2 +-
 content/lib/Objects/Object.php                                    |    2 +-
 content/lib/Objects/ObjectMapper.php                              |    2 +-
 content/lib/Tagger.php                                            |    2 +-
 content/lib/Tags/Tag.php                                          |    2 +-
 content/lib/Tags/TagMapper.php                                    |    2 +-
 content/lib/Types/Manager.php                                     |    2 +-
 content/lib/Users/Manager.php                                     |    2 +-
 content/test/Content/Autoload.php                                 |    2 +-
 content/test/Content/Base.php                                     |    2 +-
 content/test/Content/Sql/MysqlTest.php                            |    2 +-
 content/test/Content/Sql/MysqliTest.php                           |    2 +-
 folks/index.php                                                   |    2 +-
 folks/lib/Driver/sql.php                                          |    2 +-
 folks/lib/Forms/Activity.php                                      |    2 +-
 folks/lib/Forms/AddFriend.php                                     |    2 +-
 folks/lib/Forms/Login.php                                         |    2 +-
 folks/lib/Forms/Search.php                                        |    2 +-
 folks/lib/Friends/application.php                                 |    2 +-
 folks/lib/Friends/facebook.php                                    |    2 +-
 folks/lib/Friends/prefs.php                                       |    2 +-
 folks/lib/Friends/shared.php                                      |    2 +-
 folks/lib/Friends/sql.php                                         |    2 +-
 folks/locale/fi/LC_MESSAGES/folks.po                              |    2 +-
 folks/locale/lv/LC_MESSAGES/folks.po                              |    2 +-
 folks/locale/sl/LC_MESSAGES/folks.po                              |    2 +-
 folks/perms.php                                                   |    2 +-
 folks/report.php                                                  |    2 +-
 folks/scripts/mail-filter.php                                     |    2 +-
 folks/scripts/mail.php                                            |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php  |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php  |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php         |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Exception.php           |    8 +-
 .../ActiveSync/lib/Horde/ActiveSync/Exception/FolderExists.php    |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Exception/FolderGone.php      |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Exception/InvalidRequest.php  |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Exception/StaleState.php      |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Exception/StateGone.php |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php         |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php   |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php        |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Interface/ImapFactory.php     |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Interface/LoggerFactory.php   |    4 +-
 .../lib/Horde/ActiveSync/Message/AirSyncBaseAttachment.php        |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Message/AirSyncBaseBody.php   |    4 +-
 .../lib/Horde/ActiveSync/Message/AirSyncBaseFileAttachment.php    |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Attachment.php  |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Attendee.php    |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php        |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Contact.php     |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Exception.php   |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Flag.php        |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Folder.php      |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Mail.php        |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Message/MeetingRequest.php    |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Recurrence.php  |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Task.php        |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Message/TaskRecurrence.php    |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Policies.php            |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/Autodiscover.php      |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php        |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php      |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php  |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php     |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetHierarchy.php      |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php   |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/ItemOperations.php    |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/MeetingResponse.php   |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php   |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php        |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php   |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/ResolveRecipients.php |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php      |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/SendMail.php    |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Settings.php    |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/SmartForward.php      |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/SmartReply.php  |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/ValidateCert.php      |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php              |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php          |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Sync.php                |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php           |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Timezone.php            |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Translation.php         |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Utils.php               |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php               |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php       |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php       |    4 +-
 framework/ActiveSync/locale/de/LC_MESSAGES/Horde_ActiveSync.po    |    2 +-
 framework/ActiveSync/locale/eu/LC_MESSAGES/Horde_ActiveSync.po    |    2 +-
 framework/ActiveSync/locale/nl/LC_MESSAGES/Horde_ActiveSync.po    |    2 +-
 framework/Alarm/lib/Horde/Alarm.php                               |    2 +-
 framework/Alarm/lib/Horde/Alarm/Exception.php                     |    2 +-
 framework/Alarm/lib/Horde/Alarm/Handler.php                       |    2 +-
 framework/Alarm/lib/Horde/Alarm/Handler/Desktop.php               |    2 +-
 framework/Alarm/lib/Horde/Alarm/Handler/Mail.php                  |    2 +-
 framework/Alarm/lib/Horde/Alarm/Handler/Notify.php                |    2 +-
 framework/Alarm/lib/Horde/Alarm/Null.php                          |    2 +-
 framework/Alarm/lib/Horde/Alarm/Object.php                        |    2 +-
 framework/Alarm/lib/Horde/Alarm/Sql.php                           |    2 +-
 framework/Alarm/lib/Horde/Alarm/Translation.php                   |    2 +-
 framework/Alarm/locale/ar/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/bg/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/bs/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/ca/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/cs/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/da/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/de/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/el/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/en/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/es/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/et/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/eu/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/fa/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/fi/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/fr/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/gl/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/he/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/hr/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/hu/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/id/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/is/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/it/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/ja/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/km/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/ko/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/lt/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/lv/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/mk/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/nb/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/nl/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/nn/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/pl/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/pt/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/pt_BR/LC_MESSAGES/Horde_Alarm.po           |    2 +-
 framework/Alarm/locale/ro/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/ru/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/sk/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/sl/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/sv/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/tr/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/uk/LC_MESSAGES/Horde_Alarm.po              |    2 +-
 framework/Alarm/locale/zh_CN/LC_MESSAGES/Horde_Alarm.po           |    2 +-
 framework/Alarm/locale/zh_TW/LC_MESSAGES/Horde_Alarm.po           |    2 +-
 framework/Alarm/package.xml                                       |   23 ++-
 framework/Argv/doc/Horde/Argv/COPYING                             |    2 +-
 framework/Argv/lib/Horde/Argv/Translation.php                     |    2 +-
 framework/Argv/locale/ar/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/bg/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/bs/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/ca/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/cs/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/da/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/de/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/el/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/en/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/es/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/et/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/eu/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/fa/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/fi/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/fr/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/gl/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/he/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/hr/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/hu/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/id/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/is/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/it/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/ja/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/km/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/ko/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/lt/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/lv/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/mk/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/nb/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/nl/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/nn/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/pl/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/pt/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/pt_BR/LC_MESSAGES/Horde_Argv.po             |    2 +-
 framework/Argv/locale/ro/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/ru/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/sk/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/sl/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/sv/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/tr/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/uk/LC_MESSAGES/Horde_Argv.po                |    2 +-
 framework/Argv/locale/zh_CN/LC_MESSAGES/Horde_Argv.po             |    2 +-
 framework/Argv/locale/zh_TW/LC_MESSAGES/Horde_Argv.po             |    2 +-
 framework/Argv/package.xml                                        |   23 ++-
 framework/Auth/lib/Horde/Auth.php                                 |    2 +-
 framework/Auth/lib/Horde/Auth/Auto.php                            |    2 +-
 framework/Auth/lib/Horde/Auth/Base.php                            |    2 +-
 framework/Auth/lib/Horde/Auth/Composite.php                       |    2 +-
 framework/Auth/lib/Horde/Auth/Customsql.php                       |    2 +-
 framework/Auth/lib/Horde/Auth/Cyrsql.php                          |    2 +-
 framework/Auth/lib/Horde/Auth/Exception.php                       |    2 +-
 framework/Auth/lib/Horde/Auth/Ftp.php                             |    2 +-
 framework/Auth/lib/Horde/Auth/Http.php                            |    2 +-
 framework/Auth/lib/Horde/Auth/Http/Remote.php                     |    2 +-
 framework/Auth/lib/Horde/Auth/Imap.php                            |    2 +-
 framework/Auth/lib/Horde/Auth/Ipbasic.php                         |    2 +-
 framework/Auth/lib/Horde/Auth/Kolab.php                           |    2 +-
 framework/Auth/lib/Horde/Auth/Ldap.php                            |    2 +-
 framework/Auth/lib/Horde/Auth/Login.php                           |    2 +-
 framework/Auth/lib/Horde/Auth/Msad.php                            |    2 +-
 framework/Auth/lib/Horde/Auth/Pam.php                             |    4 +-
 framework/Auth/lib/Horde/Auth/Passwd.php                          |    2 +-
 framework/Auth/lib/Horde/Auth/Peclsasl.php                        |    2 +-
 framework/Auth/lib/Horde/Auth/Radius.php                          |    2 +-
 framework/Auth/lib/Horde/Auth/Smb.php                             |    2 +-
 framework/Auth/lib/Horde/Auth/Smbclient.php                       |    2 +-
 framework/Auth/lib/Horde/Auth/Sql.php                             |    2 +-
 framework/Auth/lib/Horde/Auth/Translation.php                     |    2 +-
 framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.po                |    2 +-
 framework/Auth/locale/es/LC_MESSAGES/Horde_Auth.po                |    2 +-
 framework/Auth/locale/et/LC_MESSAGES/Horde_Auth.po                |    2 +-
 framework/Auth/locale/eu/LC_MESSAGES/Horde_Auth.po                |    2 +-
 framework/Auth/locale/fi/LC_MESSAGES/Horde_Auth.po                |    2 +-
 framework/Auth/locale/ja/LC_MESSAGES/Horde_Auth.po                |    2 +-
 framework/Auth/locale/lv/LC_MESSAGES/Horde_Auth.po                |    2 +-
 framework/Auth/package.xml                                        |   32 +++-
 framework/Auth/test/Horde/Auth/TestCase.php                       |  Bin 1747 -> 1747 bytes
 framework/Auth/test/Horde/Auth/Unit/AuthTest.php                  |    2 +-
 framework/Auth/test/Horde/Auth/Unit/KolabTest.php                 |    2 +-
 framework/Auth/test/Horde/Auth/Unit/PasswdTest.php                |    2 +-
 framework/Autoloader_Cache/bin/horde-autoloader-cache-prune       |    2 +-
 framework/Browser/lib/Horde/Browser.php                           |    2 +-
 framework/Browser/lib/Horde/Browser/Exception.php                 |    2 +-
 framework/Browser/lib/Horde/Browser/Translation.php               |    2 +-
 framework/Browser/locale/ar/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/bg/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/bs/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/ca/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/cs/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/da/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/de/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/el/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/en/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/es/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/et/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/eu/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/fa/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/fi/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/fr/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/gl/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/he/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/hr/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/hu/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/id/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/is/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/it/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/ja/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/km/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/ko/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/lt/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/lv/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/mk/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/nb/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/nl/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/nn/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/pl/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/pt/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/pt_BR/LC_MESSAGES/Horde_Browser.po       |    2 +-
 framework/Browser/locale/ro/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/ru/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/sk/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/sl/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/sv/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/tr/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/uk/LC_MESSAGES/Horde_Browser.po          |    2 +-
 framework/Browser/locale/zh_CN/LC_MESSAGES/Horde_Browser.po       |    2 +-
 framework/Browser/locale/zh_TW/LC_MESSAGES/Horde_Browser.po       |    2 +-
 framework/Browser/package.xml                                     |   24 ++-
 framework/Cache/lib/Horde/Cache.php                               |    2 +-
 framework/Cache/lib/Horde/Cache/Exception.php                     |    2 +-
 framework/Cache/lib/Horde/Cache/Storage/Apc.php                   |    2 +-
 framework/Cache/lib/Horde/Cache/Storage/Base.php                  |    2 +-
 framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php          |    2 +-
 framework/Cache/lib/Horde/Cache/Storage/File.php                  |    2 +-
 framework/Cache/lib/Horde/Cache/Storage/Memcache.php              |    3 +-
 framework/Cache/lib/Horde/Cache/Storage/Mock.php                  |    2 +-
 framework/Cache/lib/Horde/Cache/Storage/Null.php                  |    2 +-
 framework/Cache/lib/Horde/Cache/Storage/Session.php               |    2 +-
 framework/Cache/lib/Horde/Cache/Storage/Sql.php                   |    2 +-
 framework/Cache/lib/Horde/Cache/Storage/Stack.php                 |    2 +-
 framework/Cache/lib/Horde/Cache/Storage/Xcache.php                |    2 +-
 framework/Cli/lib/Horde/Cli.php                                   |    2 +-
 framework/Cli/lib/Horde/Cli/Translation.php                       |    2 +-
 framework/Cli/locale/ar/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/bg/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/bs/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/ca/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/cs/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/da/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/de/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/el/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/en/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/es/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/et/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/eu/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/fa/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/fi/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/fr/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/gl/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/he/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/hr/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/hu/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/id/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/is/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/it/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/ja/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/km/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/ko/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/lt/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/lv/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/mk/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/nb/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/nl/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/nn/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/pl/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/pt/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/pt_BR/LC_MESSAGES/Horde_Cli.po               |    2 +-
 framework/Cli/locale/ro/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/ru/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/sk/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/sl/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/sv/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/tr/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/uk/LC_MESSAGES/Horde_Cli.po                  |    2 +-
 framework/Cli/locale/zh_CN/LC_MESSAGES/Horde_Cli.po               |    2 +-
 framework/Cli/locale/zh_TW/LC_MESSAGES/Horde_Cli.po               |    2 +-
 framework/Cli/package.xml                                         |   23 ++-
 framework/Cli_Modular/lib/Horde/Cli/Modular.php                   |    2 +-
 framework/Cli_Modular/lib/Horde/Cli/Modular/Exception.php         |    2 +-
 framework/Cli_Modular/lib/Horde/Cli/Modular/Module.php            |    2 +-
 framework/Cli_Modular/lib/Horde/Cli/Modular/ModuleProvider.php    |    2 +-
 framework/Cli_Modular/lib/Horde/Cli/Modular/Modules.php           |    2 +-
 framework/Cli_Modular/test/Horde/Cli/Modular/Autoload.php         |    2 +-
 framework/Cli_Modular/test/Horde/Cli/Modular/TestCase.php         |    2 +-
 framework/Cli_Modular/test/Horde/Cli/Modular/Unit/ModularTest.php |    2 +-
 .../test/Horde/Cli/Modular/Unit/ModuleProviderTest.php            |    2 +-
 framework/Cli_Modular/test/Horde/Cli/Modular/Unit/ModulesTest.php |    2 +-
 framework/Compress/lib/Horde/Compress.php                         |    2 +-
 framework/Compress/lib/Horde/Compress/Base.php                    |    2 +-
 framework/Compress/lib/Horde/Compress/Dbx.php                     |    2 +-
 framework/Compress/lib/Horde/Compress/Exception.php               |    2 +-
 framework/Compress/lib/Horde/Compress/Gzip.php                    |    2 +-
 framework/Compress/lib/Horde/Compress/Rar.php                     |    2 +-
 framework/Compress/lib/Horde/Compress/Tar.php                     |    2 +-
 framework/Compress/lib/Horde/Compress/Tnef.php                    |    2 +-
 framework/Compress/lib/Horde/Compress/Translation.php             |    2 +-
 framework/Compress/lib/Horde/Compress/Zip.php                     |    2 +-
 framework/Compress/locale/ar/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/bg/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/bs/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/ca/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/cs/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/da/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/de/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/el/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/en/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/es/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/et/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/eu/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/fa/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/fi/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/fr/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/gl/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/he/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/hr/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/hu/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/id/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/is/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/it/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/ja/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/km/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/ko/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/lt/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/lv/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/mk/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/nb/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/nl/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/nn/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/pl/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/pt/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/pt_BR/LC_MESSAGES/Horde_Compress.po     |    2 +-
 framework/Compress/locale/ro/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/ru/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/sk/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/sl/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/sv/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/tr/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/uk/LC_MESSAGES/Horde_Compress.po        |    2 +-
 framework/Compress/locale/zh_CN/LC_MESSAGES/Horde_Compress.po     |    2 +-
 framework/Compress/locale/zh_TW/LC_MESSAGES/Horde_Compress.po     |    2 +-
 framework/Compress/package.xml                                    |   23 ++-
 framework/Constraint/doc/Horde/Constraint/COPYING                 |    2 +-
 framework/Controller/doc/Horde/Controller/COPYING                 |    2 +-
 framework/Controller/lib/Horde/Controller/Exception.php           |    2 +-
 framework/Controller/test/Horde/Controller/MockRequestTest.php    |    2 +-
 framework/Core/js/autocomplete.js                                 |    2 +-
 framework/Core/js/dialog.js                                       |    2 +-
 framework/Core/js/form_assign.js                                  |    2 +-
 framework/Core/js/form_helpers.js                                 |    2 +-
 framework/Core/js/hordecore.js                                    |    2 +-
 framework/Core/js/hordetree.js                                    |    2 +-
 framework/Core/js/image.js                                        |    2 +-
 framework/Core/js/imple.js                                        |    2 +-
 framework/Core/js/inplaceeditor.js                                |    2 +-
 framework/Core/js/jquery.mobile/plugins/autocomplete.js           |    2 +-
 framework/Core/js/jquery.mobile/plugins/swipebutton.js            |    2 +-
 framework/Core/js/keynavlist.js                                   |    2 +-
 framework/Core/js/map/bing.js                                     |    2 +-
 framework/Core/js/map/cloudmade.js                                |    2 +-
 framework/Core/js/map/google.js                                   |    2 +-
 framework/Core/js/map/horde.js                                    |    2 +-
 framework/Core/js/map/mapquest.js                                 |    2 +-
 framework/Core/js/map/mytopo.js                                   |    2 +-
 framework/Core/js/map/ocm.js                                      |    2 +-
 framework/Core/js/map/osm.js                                      |    2 +-
 framework/Core/js/map/yahoo.js                                    |    2 +-
 framework/Core/js/open_html_helper.js                             |    2 +-
 framework/Core/js/prettyautocomplete.js                           |    2 +-
 framework/Core/js/smartmobile.js                                  |    2 +-
 framework/Core/js/sorter.js                                       |    2 +-
 framework/Core/js/sourceselect.js                                 |    9 +-
 framework/Core/js/spellchecker.js                                 |    2 +-
 framework/Core/js/toggle_quotes.js                                |    2 +-
 framework/Core/lib/Horde.php                                      |    2 +-
 framework/Core/lib/Horde/Config.php                               |    2 +-
 framework/Core/lib/Horde/Config/Form.php                          |    2 +-
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php            |    4 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |    2 +-
 framework/Core/lib/Horde/Core/ActiveSync/Imap/Factory.php         |    4 +-
 framework/Core/lib/Horde/Core/ActiveSync/Logger/Factory.php       |    4 +-
 framework/Core/lib/Horde/Core/Ajax/Application.php                |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Application/Handler.php        |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Application/Handler/Chunk.php  |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Application/Handler/Email.php  |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Application/Handler/Groups.php |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Application/Handler/Imple.php  |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Application/Handler/Noop.php   |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Application/Handler/Prefs.php  |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple.php                      |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php        |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter/Ajax.php   |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter/Base.php   |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter/Local.php  |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter/Pretty.php |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/ContactAutoCompleter.php |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/Geocoder/Geonames.php    |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/InPlaceEditor.php        |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php         |    2 +-
 .../lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter.php    |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Response.php                   |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Response/HordeCore.php         |    2 +-
 .../Core/lib/Horde/Core/Ajax/Response/HordeCore/JsonHtml.php      |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Response/HordeCore/NoAuth.php  |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Response/HordeCore/Reload.php  |    2 +-
 .../lib/Horde/Core/Ajax/Response/HordeCore/SessionTimeout.php     |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Response/Notifications.php     |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Response/Prototypejs.php       |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Response/Raw.php               |    2 +-
 framework/Core/lib/Horde/Core/Alarm/Handler/Notify.php            |    2 +-
 framework/Core/lib/Horde/Core/Auth/Application.php                |    2 +-
 framework/Core/lib/Horde/Core/Auth/Composite.php                  |    2 +-
 framework/Core/lib/Horde/Core/Auth/Imsp.php                       |    2 +-
 framework/Core/lib/Horde/Core/Auth/Ldap.php                       |    2 +-
 framework/Core/lib/Horde/Core/Auth/Msad.php                       |    2 +-
 framework/Core/lib/Horde/Core/Auth/Shibboleth.php                 |    2 +-
 framework/Core/lib/Horde/Core/Auth/Signup/Base.php                |    2 +-
 framework/Core/lib/Horde/Core/Auth/Signup/Form.php                |    2 +-
 framework/Core/lib/Horde/Core/Auth/Signup/Null.php                |    2 +-
 framework/Core/lib/Horde/Core/Auth/Signup/Sql.php                 |    2 +-
 framework/Core/lib/Horde/Core/Auth/Signup/SqlObject.php           |    2 +-
 framework/Core/lib/Horde/Core/Block.php                           |    2 +-
 framework/Core/lib/Horde/Core/Block/Collection.php                |    2 +-
 framework/Core/lib/Horde/Core/Block/Layout.php                    |    2 +-
 framework/Core/lib/Horde/Core/Block/Layout/Manager.php            |    2 +-
 framework/Core/lib/Horde/Core/Block/Layout/View.php               |    2 +-
 framework/Core/lib/Horde/Core/Block/Upgrade.php                   |    2 +-
 framework/Core/lib/Horde/Core/Browser.php                         |    2 +-
 framework/Core/lib/Horde/Core/Bundle.php                          |    2 +-
 framework/Core/lib/Horde/Core/Cli.php                             |    2 +-
 framework/Core/lib/Horde/Core/Data/Storage.php                    |    2 +-
 framework/Core/lib/Horde/Core/Db/Migration.php                    |    2 +-
 framework/Core/lib/Horde/Core/Editor/Ckeditor.php                 |   10 +-
 framework/Core/lib/Horde/Core/Factory/Ajax.php                    |    2 +-
 framework/Core/lib/Horde/Core/Factory/Alarm.php                   |    2 +-
 framework/Core/lib/Horde/Core/Factory/Auth.php                    |    2 +-
 framework/Core/lib/Horde/Core/Factory/Base.php                    |    2 +-
 framework/Core/lib/Horde/Core/Factory/BlockCollection.php         |    2 +-
 framework/Core/lib/Horde/Core/Factory/Cache.php                   |    2 +-
 framework/Core/lib/Horde/Core/Factory/Crypt.php                   |    2 +-
 framework/Core/lib/Horde/Core/Factory/Data.php                    |    2 +-
 framework/Core/lib/Horde/Core/Factory/Db.php                      |    2 +-
 framework/Core/lib/Horde/Core/Factory/DbPear.php                  |    2 +-
 framework/Core/lib/Horde/Core/Factory/Editor.php                  |    2 +-
 framework/Core/lib/Horde/Core/Factory/ElasticSearch.php           |    2 +-
 framework/Core/lib/Horde/Core/Factory/Identity.php                |    2 +-
 framework/Core/lib/Horde/Core/Factory/Imple.php                   |    2 +-
 framework/Core/lib/Horde/Core/Factory/Imsp.php                    |    2 +-
 framework/Core/lib/Horde/Core/Factory/ImspAuth.php                |    2 +-
 framework/Core/lib/Horde/Core/Factory/Injector.php                |    2 +-
 framework/Core/lib/Horde/Core/Factory/KolabServer.php             |    2 +-
 framework/Core/lib/Horde/Core/Factory/KolabSession.php            |    2 +-
 framework/Core/lib/Horde/Core/Factory/KolabStorage.php            |    2 +-
 framework/Core/lib/Horde/Core/Factory/LanguageDetect.php          |    2 +-
 framework/Core/lib/Horde/Core/Factory/Ldap.php                    |    2 +-
 framework/Core/lib/Horde/Core/Factory/Lock.php                    |    2 +-
 framework/Core/lib/Horde/Core/Factory/LoginTasks.php              |    2 +-
 framework/Core/lib/Horde/Core/Factory/MimeViewer.php              |    2 +-
 framework/Core/lib/Horde/Core/Factory/Perms.php                   |    2 +-
 framework/Core/lib/Horde/Core/Factory/PermsCore.php               |    2 +-
 framework/Core/lib/Horde/Core/Factory/Prefs.php                   |    2 +-
 framework/Core/lib/Horde/Core/Factory/SessionHandler.php          |    2 +-
 framework/Core/lib/Horde/Core/Factory/Share.php                   |    2 +-
 framework/Core/lib/Horde/Core/Factory/ShareBase.php               |    2 +-
 framework/Core/lib/Horde/Core/Factory/SpellChecker.php            |    2 +-
 framework/Core/lib/Horde/Core/Factory/TextFilter.php              |    2 +-
 framework/Core/lib/Horde/Core/Factory/ThemesCache.php             |    2 +-
 framework/Core/lib/Horde/Core/Factory/Timezone.php                |    2 +-
 framework/Core/lib/Horde/Core/Factory/Topbar.php                  |    2 +-
 framework/Core/lib/Horde/Core/Factory/Tree.php                    |    2 +-
 framework/Core/lib/Horde/Core/Factory/Vfs.php                     |    2 +-
 framework/Core/lib/Horde/Core/Factory/View.php                    |    4 +-
 framework/Core/lib/Horde/Core/Group/Ldap.php                      |    2 +-
 framework/Core/lib/Horde/Core/Imsp/Utils.php                      |    2 +-
 framework/Core/lib/Horde/Core/Log/Logger.php                      |    2 +-
 framework/Core/lib/Horde/Core/LoginTasks.php                      |    2 +-
 framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php        |    2 +-
 framework/Core/lib/Horde/Core/LoginTasks/SystemTask/Upgrade.php   |    2 +-
 framework/Core/lib/Horde/Core/Mime/Viewer/Syntaxhighlighter.php   |    2 +-
 framework/Core/lib/Horde/Core/Mime/Viewer/Vcard.php               |    2 +-
 framework/Core/lib/Horde/Core/Notification/Event/Status.php       |    2 +-
 .../Core/lib/Horde/Core/Notification/Handler/Decorator/Base.php   |    2 +-
 .../lib/Horde/Core/Notification/Handler/Decorator/Hordelog.php    |    2 +-
 .../Core/lib/Horde/Core/Notification/Listener/DynamicStatus.php   |    2 +-
 .../lib/Horde/Core/Notification/Listener/SmartmobileStatus.php    |    2 +-
 framework/Core/lib/Horde/Core/Notification/Storage/Session.php    |    2 +-
 framework/Core/lib/Horde/Core/Perms.php                           |    2 +-
 framework/Core/lib/Horde/Core/Perms/Ui.php                        |    2 +-
 framework/Core/lib/Horde/Core/Prefs/Cache/Session.php             |    2 +-
 framework/Core/lib/Horde/Core/Prefs/Identity.php                  |    2 +-
 framework/Core/lib/Horde/Core/Prefs/Storage/Configuration.php     |    2 +-
 framework/Core/lib/Horde/Core/Prefs/Storage/Hooks.php             |    2 +-
 framework/Core/lib/Horde/Core/Prefs/Storage/Upgrade.php           |    2 +-
 framework/Core/lib/Horde/Core/Prefs/Ui.php                        |    4 +-
 framework/Core/lib/Horde/Core/Prefs/Ui/Special.php                |    2 +-
 framework/Core/lib/Horde/Core/Prefs/Ui/Widgets.php                |   12 +-
 framework/Core/lib/Horde/Core/Script/Package/Datejs.php           |    2 +-
 framework/Core/lib/Horde/Core/Script/Package/Dialog.php           |    2 +-
 framework/Core/lib/Horde/Core/Script/Package/Keynavlist.php       |    2 +-
 framework/Core/lib/Horde/Core/Script/Package/Popup.php            |    2 +-
 framework/Core/lib/Horde/Core/Secret.php                          |    2 +-
 framework/Core/lib/Horde/Core/Share/Driver.php                    |    2 +-
 framework/Core/lib/Horde/Core/Share/FactoryCallback.php           |    2 +-
 framework/Core/lib/Horde/Core/Smartmobile/Url.php                 |    2 +-
 framework/Core/lib/Horde/Core/Smartmobile/View/Helper.php         |    2 +-
 framework/Core/lib/Horde/Core/TagBrowser.php                      |    2 +-
 framework/Core/lib/Horde/Core/Tagger.php                          |    2 +-
 framework/Core/lib/Horde/Core/Text/Filter/Bbcode.php              |    2 +-
 framework/Core/lib/Horde/Core/Text/Filter/Emails.php              |    2 +-
 framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php           |    2 +-
 framework/Core/lib/Horde/Core/Text/Filter/Highlightquotes.php     |    2 +-
 framework/Core/lib/Horde/Core/Topbar.php                          |    2 +-
 framework/Core/lib/Horde/Core/Translation.php                     |    2 +-
 framework/Core/lib/Horde/Core/Tree/Renderer/Html.php              |    2 +-
 framework/Core/lib/Horde/Core/Tree/Renderer/Javascript.php        |    2 +-
 framework/Core/lib/Horde/Core/Tree/Renderer/Simplehtml.php        |    2 +-
 framework/Core/lib/Horde/Core/Ui/FlagImage.php                    |    2 +-
 framework/Core/lib/Horde/Core/Ui/JsCalendar.php                   |    2 +-
 framework/Core/lib/Horde/Core/Ui/Language.php                     |    2 +-
 framework/Core/lib/Horde/Core/Ui/ModalFormRenderer.php            |    2 +-
 framework/Core/lib/Horde/Core/Ui/Pager.php                        |    2 +-
 framework/Core/lib/Horde/Core/Ui/Tabs.php                         |    2 +-
 framework/Core/lib/Horde/Core/Ui/TagCloud.php                     |    2 +-
 framework/Core/lib/Horde/Core/Ui/VarRenderer.php                  |    2 +-
 framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php             |    2 +-
 framework/Core/lib/Horde/Core/Ui/VarRenderer/TablesetHtml.php     |    2 +-
 framework/Core/lib/Horde/Core/Ui/Widget.php                       |    2 +-
 framework/Core/lib/Horde/Core/View/Helper/Accesskey.php           |    2 +-
 framework/Core/lib/Horde/Core/View/Helper/Help.php                |    2 +-
 framework/Core/lib/Horde/Core/View/Helper/Image.php               |    2 +-
 framework/Core/lib/Horde/Core/View/Helper/Label.php               |    2 +-
 framework/Core/lib/Horde/ErrorHandler.php                         |    2 +-
 framework/Core/lib/Horde/Exception/AuthenticationFailure.php      |    2 +-
 framework/Core/lib/Horde/Exception/PushApp.php                    |    2 +-
 framework/Core/lib/Horde/Help.php                                 |    2 +-
 framework/Core/lib/Horde/Menu.php                                 |    2 +-
 framework/Core/lib/Horde/PageOutput.php                           |    2 +-
 framework/Core/lib/Horde/Registry.php                             |    2 +-
 framework/Core/lib/Horde/Registry/Api.php                         |    2 +-
 framework/Core/lib/Horde/Registry/Application.php                 |    2 +-
 framework/Core/lib/Horde/Registry/Caller.php                      |    2 +-
 framework/Core/lib/Horde/Registry/Nlsconfig.php                   |    2 +-
 framework/Core/lib/Horde/Script/File.php                          |    2 +-
 framework/Core/lib/Horde/Script/File/External.php                 |    2 +-
 framework/Core/lib/Horde/Script/File/JsDir.php                    |    2 +-
 framework/Core/lib/Horde/Script/File/JsFramework.php              |    2 +-
 framework/Core/lib/Horde/Script/List.php                          |    2 +-
 framework/Core/lib/Horde/Script/Package.php                       |    2 +-
 framework/Core/lib/Horde/Session.php                              |    2 +-
 framework/Core/lib/Horde/Session/Null.php                         |    2 +-
 framework/Core/lib/Horde/Themes.php                               |    2 +-
 framework/Core/lib/Horde/Themes/Cache.php                         |    2 +-
 framework/Core/lib/Horde/Themes/Css.php                           |    2 +-
 framework/Core/lib/Horde/Themes/Element.php                       |    2 +-
 framework/Core/lib/Horde/Themes/Image.php                         |    2 +-
 framework/Core/lib/Horde/Themes/Sound.php                         |    2 +-
 framework/Core/locale/ar/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/bg/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/bs/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/ca/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/cs/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/da/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/el/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/en/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/es/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/et/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/eu/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/fa/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/fi/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/fr/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/gl/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/he/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/hr/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/hu/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/id/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/is/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/it/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/ja/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/km/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/ko/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/lt/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/lv/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/mk/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/nb/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/nl/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/nn/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/pl/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/pt/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/pt_BR/LC_MESSAGES/Horde_Core.po             |    2 +-
 framework/Core/locale/ro/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/ru/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/sk/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/sl/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/sv/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/tr/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/uk/LC_MESSAGES/Horde_Core.po                |    2 +-
 framework/Core/locale/zh_CN/LC_MESSAGES/Horde_Core.po             |    2 +-
 framework/Core/locale/zh_TW/LC_MESSAGES/Horde_Core.po             |    2 +-
 framework/Core/package.xml                                        |   21 ++-
 framework/Core/test/Horde/Core/Factory/GroupTest.php              |    2 +-
 framework/Core/test/Horde/Core/Factory/KolabServerTest.php        |    2 +-
 framework/Core/test/Horde/Core/Factory/KolabSessionTest.php       |    2 +-
 framework/Core/test/Horde/Core/RegistryTest.php                   |    2 +-
 framework/Core/test/Horde/Core/Stub/Registry.php                  |    2 +-
 framework/Crypt/lib/Horde/Crypt.php                               |    2 +-
 framework/Crypt/lib/Horde/Crypt/Exception.php                     |    2 +-
 framework/Crypt/lib/Horde/Crypt/Pgp.php                           |    2 +-
 framework/Crypt/lib/Horde/Crypt/Smime.php                         |    2 +-
 framework/Crypt/lib/Horde/Crypt/Translation.php                   |    2 +-
 framework/Crypt/locale/ar/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/bg/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/bs/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/ca/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/cs/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/da/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/de/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/el/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/en/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/es/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/et/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/eu/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/fa/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/fi/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/fr/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/gl/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/he/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/hr/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/hu/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/id/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/is/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/it/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/ja/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/km/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/ko/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/lt/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/lv/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/mk/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/nb/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/nl/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/nn/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/pl/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/pt/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/pt_BR/LC_MESSAGES/Horde_Crypt.po           |    2 +-
 framework/Crypt/locale/ro/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/ru/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/sk/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/sl/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/sv/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/tr/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/uk/LC_MESSAGES/Horde_Crypt.po              |    2 +-
 framework/Crypt/locale/zh_CN/LC_MESSAGES/Horde_Crypt.po           |    2 +-
 framework/Crypt/locale/zh_TW/LC_MESSAGES/Horde_Crypt.po           |    2 +-
 framework/Crypt/package.xml                                       |   23 ++-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish.php             |    6 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Base.php        |    6 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Exception.php   |    6 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Mcrypt.php      |    6 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Openssl.php     |    6 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php.php         |    6 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php/Base.php    |    6 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php/Cbc.php     |    6 +-
 framework/Crypt_Blowfish/lib/Horde/Crypt/Blowfish/Php/Ecb.php     |    6 +-
 framework/Crypt_Blowfish/package.xml                              |   21 ++-
 framework/Data/lib/Horde/Data.php                                 |    2 +-
 framework/Data/lib/Horde/Data/Base.php                            |    2 +-
 framework/Data/lib/Horde/Data/Csv.php                             |    2 +-
 framework/Data/lib/Horde/Data/Exception.php                       |    2 +-
 framework/Data/lib/Horde/Data/Exception/Charset.php               |    2 +-
 framework/Data/lib/Horde/Data/Icalendar.php                       |    2 +-
 framework/Data/lib/Horde/Data/Imc.php                             |    2 +-
 framework/Data/lib/Horde/Data/Outlookcsv.php                      |    2 +-
 framework/Data/lib/Horde/Data/Storage.php                         |    2 +-
 framework/Data/lib/Horde/Data/Storage/Mock.php                    |    2 +-
 framework/Data/lib/Horde/Data/Translation.php                     |    2 +-
 framework/Data/lib/Horde/Data/Tsv.php                             |    2 +-
 framework/Data/lib/Horde/Data/Vcard.php                           |    2 +-
 framework/Data/lib/Horde/Data/Vnote.php                           |    2 +-
 framework/Data/lib/Horde/Data/Vtodo.php                           |    2 +-
 framework/Data/locale/ar/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/bg/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/bs/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/ca/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/cs/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/da/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/de/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/el/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/en/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/es/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/et/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/eu/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/fa/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/fi/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/fr/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/gl/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/he/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/hr/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/hu/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/id/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/is/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/it/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/ja/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/km/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/ko/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/lt/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/lv/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/mk/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/nb/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/nl/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/nn/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/pl/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/pt/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/pt_BR/LC_MESSAGES/Horde_Data.po             |    2 +-
 framework/Data/locale/ro/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/ru/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/sk/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/sl/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/sv/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/tr/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/uk/LC_MESSAGES/Horde_Data.po                |    2 +-
 framework/Data/locale/zh_CN/LC_MESSAGES/Horde_Data.po             |    2 +-
 framework/Data/locale/zh_TW/LC_MESSAGES/Horde_Data.po             |    2 +-
 framework/Data/package.xml                                        |   23 ++-
 framework/Date/lib/Horde/Date/Exception.php                       |    2 +-
 framework/Date/lib/Horde/Date/Recurrence.php                      |    2 +-
 framework/Date/lib/Horde/Date/Repeater.php                        |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Day.php                    |    2 +-
 framework/Date/lib/Horde/Date/Repeater/DayName.php                |    2 +-
 framework/Date/lib/Horde/Date/Repeater/DayPortion.php             |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Exception.php              |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Fortnight.php              |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Hour.php                   |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Minute.php                 |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Month.php                  |    2 +-
 framework/Date/lib/Horde/Date/Repeater/MonthName.php              |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Season.php                 |    2 +-
 framework/Date/lib/Horde/Date/Repeater/SeasonName.php             |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Second.php                 |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Time.php                   |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Week.php                   |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Weekend.php                |    2 +-
 framework/Date/lib/Horde/Date/Repeater/Year.php                   |    2 +-
 framework/Date/lib/Horde/Date/Span.php                            |    2 +-
 framework/Date/lib/Horde/Date/Translation.php                     |    2 +-
 framework/Date/locale/ar/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/bg/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/bs/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/ca/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/cs/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/da/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/de/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/el/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/en/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/es/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/et/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/eu/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/fa/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/fi/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/fr/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/gl/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/he/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/hr/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/hu/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/id/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/is/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/it/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/ja/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/km/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/ko/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/lt/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/lv/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/mk/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/nb/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/nl/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/nn/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/pl/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/pt/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/pt_BR/LC_MESSAGES/Horde_Date.po             |    2 +-
 framework/Date/locale/ro/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/ru/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/sk/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/sl/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/sv/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/tr/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/uk/LC_MESSAGES/Horde_Date.po                |    2 +-
 framework/Date/locale/zh_CN/LC_MESSAGES/Horde_Date.po             |    2 +-
 framework/Date/locale/zh_TW/LC_MESSAGES/Horde_Date.po             |    2 +-
 framework/Date/package.xml                                        |   26 ++-
 framework/Db/bin/horde-db-migrate-component                       |    2 +-
 framework/Db/doc/Horde/Db/COPYING                                 |    2 +-
 framework/Db/lib/Horde/Db.php                                     |    2 +-
 framework/Db/lib/Horde/Db/Adapter.php                             |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Base.php                        |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Base/Column.php                 |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Base/ColumnDefinition.php       |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Base/Index.php                  |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Base/Schema.php                 |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Base/Table.php                  |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Base/TableDefinition.php        |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Mysql.php                       |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Mysql/Column.php                |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Mysql/Result.php                |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php                |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Mysqli.php                      |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Mysqli/Result.php               |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php                    |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Pdo/Mysql.php                   |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Pdo/Pgsql.php                   |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Pdo/Sqlite.php                  |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Postgresql/Column.php           |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php           |    2 +-
 framework/Db/lib/Horde/Db/Adapter/SplitRead.php                   |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php               |    2 +-
 framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php               |    2 +-
 framework/Db/lib/Horde/Db/Exception.php                           |    2 +-
 framework/Db/lib/Horde/Db/Migration/Base.php                      |    2 +-
 framework/Db/lib/Horde/Db/Migration/Exception.php                 |    2 +-
 framework/Db/lib/Horde/Db/Migration/Migrator.php                  |    2 +-
 framework/Db/lib/Horde/Db/SearchParser.php                        |    2 +-
 framework/Db/lib/Horde/Db/StatementParser.php                     |    2 +-
 framework/Db/lib/Horde/Db/Value.php                               |    2 +-
 framework/Db/lib/Horde/Db/Value/Binary.php                        |    2 +-
 framework/Db/test/Horde/Db/Adapter/MissingTest.php                |    2 +-
 framework/Db/test/Horde/Db/Adapter/Mysql/ColumnDefinitionTest.php |    2 +-
 framework/Db/test/Horde/Db/Adapter/Mysql/ColumnTest.php           |    2 +-
 framework/Db/test/Horde/Db/Adapter/Mysql/TableDefinitionTest.php  |    2 +-
 framework/Db/test/Horde/Db/Adapter/MysqlSuite.php                 |    2 +-
 framework/Db/test/Horde/Db/Adapter/MysqlTest.php                  |    2 +-
 framework/Db/test/Horde/Db/Adapter/MysqliSuite.php                |    2 +-
 framework/Db/test/Horde/Db/Adapter/MysqliTest.php                 |    2 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php             |    2 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php              |    2 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php             |    2 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php              |    2 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php            |    2 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php             |    2 +-
 .../Db/test/Horde/Db/Adapter/Postgresql/ColumnDefinitionTest.php  |    2 +-
 framework/Db/test/Horde/Db/Adapter/Postgresql/ColumnTest.php      |    2 +-
 .../Db/test/Horde/Db/Adapter/Postgresql/TableDefinitionTest.php   |    2 +-
 .../Db/test/Horde/Db/Adapter/Sqlite/ColumnDefinitionTest.php      |    2 +-
 framework/Db/test/Horde/Db/Adapter/Sqlite/ColumnTest.php          |    2 +-
 framework/Db/test/Horde/Db/Adapter/Sqlite/TableDefinitionTest.php |    2 +-
 framework/Db/test/Horde/Db/Migration/BaseTest.php                 |    2 +-
 framework/Db/test/Horde/Db/Migration/MigratorTest.php             |    2 +-
 framework/Db/test/Horde/Db/fixtures/unit_tests.sql                |    2 +-
 framework/Editor/lib/Horde/Editor.php                             |    2 +-
 framework/Editor/lib/Horde/Editor/Ckeditor.php                    |   10 +-
 framework/Editor/lib/Horde/Editor/Exception.php                   |    2 +-
 framework/ElasticSearch/doc/Horde/ElasticSearch/COPYING           |    4 +-
 framework/ElasticSearch/doc/Horde/ElasticSearch/examples/add.php  |    2 +-
 .../ElasticSearch/doc/Horde/ElasticSearch/examples/count.php      |    2 +-
 framework/ElasticSearch/doc/Horde/ElasticSearch/examples/get.php  |    2 +-
 framework/ElasticSearch/doc/Horde/ElasticSearch/examples/map.php  |    2 +-
 .../ElasticSearch/doc/Horde/ElasticSearch/examples/search.php     |    2 +-
 .../ElasticSearch/doc/Horde/ElasticSearch/examples/status.php     |    2 +-
 framework/ElasticSearch/lib/Horde/ElasticSearch/Client.php        |    2 +-
 framework/ElasticSearch/lib/Horde/ElasticSearch/Exception.php     |    2 +-
 framework/ElasticSearch/lib/Horde/ElasticSearch/Index.php         |    2 +-
 framework/ElasticSearch/lib/Horde/ElasticSearch/Type.php          |    2 +-
 framework/Exception/lib/Horde/Exception.php                       |    2 +-
 framework/Exception/lib/Horde/Exception/LastError.php             |    2 +-
 framework/Exception/lib/Horde/Exception/NotFound.php              |    2 +-
 framework/Exception/lib/Horde/Exception/Pear.php                  |    2 +-
 framework/Exception/lib/Horde/Exception/PermissionDenied.php      |    2 +-
 framework/Exception/lib/Horde/Exception/Translation.php           |    2 +-
 framework/Exception/lib/Horde/Exception/Wrapped.php               |    2 +-
 framework/Exception/locale/ar/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/bg/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/bs/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/ca/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/cs/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/da/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/de/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/el/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/en/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/es/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/et/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/eu/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/fa/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/fi/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/fr/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/gl/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/he/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/hr/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/hu/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/id/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/is/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/it/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/ja/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/km/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/ko/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/lt/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/lv/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/mk/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/nb/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/nl/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/nn/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/pl/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/pt/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/pt_BR/LC_MESSAGES/Horde_Exception.po   |    2 +-
 framework/Exception/locale/ro/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/ru/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/sk/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/sl/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/sv/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/tr/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/uk/LC_MESSAGES/Horde_Exception.po      |    2 +-
 framework/Exception/locale/zh_CN/LC_MESSAGES/Horde_Exception.po   |    2 +-
 framework/Exception/locale/zh_TW/LC_MESSAGES/Horde_Exception.po   |    2 +-
 framework/Exception/package.xml                                   |   23 ++-
 framework/Exception/test/Horde/Exception/ExceptionTest.php        |    2 +-
 framework/Feed/doc/Horde/Feed/COPYING                             |    2 +-
 framework/Feed/lib/Horde/Feed.php                                 |    2 +-
 framework/Feed/lib/Horde/Feed/Atom.php                            |    2 +-
 framework/Feed/lib/Horde/Feed/Base.php                            |    2 +-
 framework/Feed/lib/Horde/Feed/Blogroll.php                        |    2 +-
 framework/Feed/lib/Horde/Feed/Entry/Atom.php                      |    2 +-
 framework/Feed/lib/Horde/Feed/Entry/Base.php                      |    2 +-
 framework/Feed/lib/Horde/Feed/Entry/Blogroll.php                  |    2 +-
 framework/Feed/lib/Horde/Feed/Entry/Rss.php                       |    2 +-
 framework/Feed/lib/Horde/Feed/Rss.php                             |    2 +-
 framework/Form/lib/Horde/Form.php                                 |    2 +-
 framework/Form/lib/Horde/Form/Action/ConditionalEnable.php        |    2 +-
 framework/Form/lib/Horde/Form/Action/ConditionalSetValue.php      |    2 +-
 framework/Form/lib/Horde/Form/Action/SumFields.php                |    2 +-
 framework/Form/lib/Horde/Form/Action/reload.php                   |    2 +-
 framework/Form/lib/Horde/Form/Action/setcursorpos.php             |    2 +-
 framework/Form/lib/Horde/Form/Action/submit.php                   |    2 +-
 framework/Form/lib/Horde/Form/Action/updatefield.php              |    2 +-
 framework/Form/lib/Horde/Form/Translation.php                     |    2 +-
 framework/Form/locale/ar/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/bg/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/bs/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/ca/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/cs/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/da/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/de/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/el/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/en/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/es/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/et/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/eu/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/fa/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/fi/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/fr/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/gl/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/he/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/hr/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/hu/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/id/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/is/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/it/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/ja/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/km/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/ko/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/lt/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/lv/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/mk/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/nb/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/nl/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/nn/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/pl/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/pt/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/pt_BR/LC_MESSAGES/Horde_Form.po             |    2 +-
 framework/Form/locale/ro/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/ru/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/sk/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/sl/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/sv/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/tr/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/uk/LC_MESSAGES/Horde_Form.po                |    2 +-
 framework/Form/locale/zh_CN/LC_MESSAGES/Horde_Form.po             |    2 +-
 framework/Form/locale/zh_TW/LC_MESSAGES/Horde_Form.po             |    2 +-
 framework/Form/package.xml                                        |   25 ++-
 framework/Group/lib/Horde/Group/Base.php                          |    2 +-
 framework/Group/lib/Horde/Group/Exception.php                     |    2 +-
 framework/Group/lib/Horde/Group/Kolab.php                         |    2 +-
 framework/Group/lib/Horde/Group/Ldap.php                          |    2 +-
 framework/Group/lib/Horde/Group/Mock.php                          |    2 +-
 framework/Group/lib/Horde/Group/Sql.php                           |    2 +-
 framework/Group/test/Horde/Group/Base.php                         |    2 +-
 framework/Group/test/Horde/Group/LdapTest.php                     |    2 +-
 framework/Group/test/Horde/Group/MockTest.php                     |    2 +-
 framework/Group/test/Horde/Group/Sql/Base.php                     |    2 +-
 framework/Group/test/Horde/Group/Sql/MysqlTest.php                |    2 +-
 framework/Group/test/Horde/Group/Sql/MysqliTest.php               |    2 +-
 framework/Group/test/Horde/Group/Sql/Pdo/MysqlTest.php            |    2 +-
 framework/Group/test/Horde/Group/Sql/Pdo/PgsqlTest.php            |    2 +-
 framework/Group/test/Horde/Group/Sql/Pdo/SqliteTest.php           |    2 +-
 framework/Group/test/Horde/Group/Stub/Api.php                     |    2 +-
 framework/History/lib/Horde/History.php                           |    2 +-
 framework/History/lib/Horde/History/Exception.php                 |    2 +-
 framework/History/lib/Horde/History/Log.php                       |    2 +-
 framework/History/lib/Horde/History/Mock.php                      |    2 +-
 framework/History/lib/Horde/History/Sql.php                       |    2 +-
 framework/History/test/Horde/History/InterfaceTest.php            |    2 +-
 framework/Http/doc/Horde/Http/COPYING                             |    2 +-
 framework/Http/doc/Horde/Http/examples/get-example-dot-com.php    |    2 +-
 framework/Http/lib/Horde/Http.php                                 |    2 +-
 framework/Http/lib/Horde/Http/Client.php                          |    2 +-
 framework/Http/lib/Horde/Http/Exception.php                       |    2 +-
 framework/Http/lib/Horde/Http/Request/Base.php                    |    2 +-
 framework/Http/lib/Horde/Http/Request/Curl.php                    |    2 +-
 framework/Http/lib/Horde/Http/Request/Factory.php                 |    2 +-
 framework/Http/lib/Horde/Http/Request/Fopen.php                   |    2 +-
 framework/Http/lib/Horde/Http/Request/Mock.php                    |    2 +-
 framework/Http/lib/Horde/Http/Request/Peclhttp.php                |    2 +-
 framework/Http/lib/Horde/Http/Response/Base.php                   |    2 +-
 framework/Http/lib/Horde/Http/Response/Curl.php                   |    2 +-
 framework/Http/lib/Horde/Http/Response/Fopen.php                  |    2 +-
 framework/Http/lib/Horde/Http/Response/Mock.php                   |    2 +-
 framework/Http/lib/Horde/Http/Response/Peclhttp.php               |    2 +-
 framework/Http/test/Horde/Http/ClientTest.php                     |    4 +-
 framework/Http/test/Horde/Http/CurlTest.php                       |    4 +-
 framework/Http/test/Horde/Http/FopenTest.php                      |    2 +-
 framework/Icalendar/doc/Horde/Icalendar/COPYING                   |    2 +-
 framework/Icalendar/lib/Horde/Icalendar.php                       |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Daylight.php              |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Exception.php             |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Standard.php              |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Translation.php           |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Valarm.php                |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Vcard.php                 |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Vevent.php                |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Vfreebusy.php             |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Vjournal.php              |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Vnote.php                 |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Vtimezone.php             |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Vtodo.php                 |    2 +-
 framework/Icalendar/locale/ar/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/bg/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/bs/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/ca/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/cs/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/da/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/de/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/el/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/en/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/es/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/et/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/eu/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/fa/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/fi/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/fr/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/gl/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/he/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/hr/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/hu/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/id/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/is/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/it/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/ja/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/km/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/ko/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/lt/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/lv/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/mk/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/nb/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/nl/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/nn/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/pl/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/pt/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/pt_BR/LC_MESSAGES/Horde_Icalendar.po   |    2 +-
 framework/Icalendar/locale/ro/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/ru/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/sk/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/sl/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/sv/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/tr/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/uk/LC_MESSAGES/Horde_Icalendar.po      |    2 +-
 framework/Icalendar/locale/zh_CN/LC_MESSAGES/Horde_Icalendar.po   |    2 +-
 framework/Icalendar/locale/zh_TW/LC_MESSAGES/Horde_Icalendar.po   |    2 +-
 framework/Icalendar/package.xml                                   |   23 ++-
 framework/Image/lib/Horde/Image.php                               |    2 +-
 framework/Image/lib/Horde/Image/Base.php                          |    2 +-
 framework/Image/lib/Horde/Image/Effect/Im/Composite.php           |    2 +-
 framework/Image/lib/Horde/Image/Effect/Im/DropShadow.php          |    2 +-
 framework/Image/lib/Horde/Image/Effect/Im/LiquidResize.php        |    2 +-
 framework/Image/lib/Horde/Image/Effect/Im/PhotoStack.php          |    2 +-
 framework/Image/lib/Horde/Image/Effect/Im/PolaroidImage.php       |    2 +-
 framework/Image/lib/Horde/Image/Effect/Im/RoundCorners.php        |    2 +-
 framework/Image/lib/Horde/Image/Effect/Im/TextWatermark.php       |    2 +-
 framework/Image/lib/Horde/Image/Effect/Im/Unsharpmask.php         |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/CenterCrop.php     |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/Composite.php      |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/DropShadow.php     |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/LiquidResize.php   |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/PhotoStack.php     |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/PolaroidImage.php  |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/RoundCorners.php   |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/SmartCrop.php      |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/TextWatermark.php  |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/Unsharpmask.php    |    2 +-
 framework/Image/lib/Horde/Image/Exif.php                          |    2 +-
 framework/Image/lib/Horde/Image/Exif/Base.php                     |    2 +-
 framework/Image/lib/Horde/Image/Exif/Bundled.php                  |    2 +-
 framework/Image/lib/Horde/Image/Exif/Exiftool.php                 |    2 +-
 framework/Image/lib/Horde/Image/Exif/Php.php                      |    2 +-
 framework/Image/lib/Horde/Image/Gd.php                            |    2 +-
 framework/Image/lib/Horde/Image/Im.php                            |    2 +-
 framework/Image/lib/Horde/Image/Imagick.php                       |    2 +-
 framework/Image/lib/Horde/Image/Png.php                           |    2 +-
 framework/Image/lib/Horde/Image/Svg.php                           |    2 +-
 framework/Image/lib/Horde/Image/Swf.php                           |    2 +-
 framework/Image/lib/Horde/Image/Translation.php                   |    2 +-
 framework/Image/locale/ar/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/bg/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/bs/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/ca/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/cs/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/da/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/de/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/el/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/en/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/es/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/et/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/eu/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/fa/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/fi/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/fr/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/gl/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/he/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/hr/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/hu/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/id/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/is/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/it/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/ja/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/km/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/ko/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/lt/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/lv/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/mk/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/nb/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/nl/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/nn/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/pl/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/pt/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/pt_BR/LC_MESSAGES/Horde_Image.po           |    2 +-
 framework/Image/locale/ro/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/ru/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/sk/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/sl/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/sv/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/tr/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/uk/LC_MESSAGES/Horde_Image.po              |    2 +-
 framework/Image/locale/zh_CN/LC_MESSAGES/Horde_Image.po           |    2 +-
 framework/Image/locale/zh_TW/LC_MESSAGES/Horde_Image.po           |    2 +-
 framework/Image/package.xml                                       |   23 ++-
 framework/Image/test/Horde/Image/Exif/Base.php                    |    2 +-
 framework/Image/test/Horde/Image/Exif/BundledTest.php             |    2 +-
 framework/Image/test/Horde/Image/Exif/ExiftoolTest.php            |    2 +-
 framework/Image/test/Horde/Image/Exif/PhpTest.php                 |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client.php                   |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Auth/DigestMD5.php    |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Debug.php        |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Deprecated.php   |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Mailbox.php      |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Cache.php             |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Acl.php          |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/AclCommon.php    |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/AclNegative.php  |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/AclRights.php    |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/BaseSubject.php  |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Envelope.php     |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Fetch.php        |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Fetch/Pop3.php   |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format.php       |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Astring.php     |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/Atom.php  |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/Date.php  |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/DateTime.php    |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Exception.php   |    6 +-
 .../lib/Horde/Imap/Client/Data/Format/Filter/Quote.php            |    6 +-
 .../lib/Horde/Imap/Client/Data/Format/Filter/String.php           |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/List.php  |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/ListMailbox.php |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Mailbox.php     |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/Nil.php   |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Nstring.php     |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Number.php      |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/String.php      |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Sync.php         |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Thread.php       |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/DateTime.php          |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Exception.php         |    6 +-
 .../lib/Horde/Imap/Client/Exception/NoSupportExtension.php        |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Exception/NoSupportPop3.php |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Exception/SearchCharset.php |    6 +-
 .../lib/Horde/Imap/Client/Exception/ServerResponse.php            |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Exception/Sync.php    |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Query.php       |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Results.php     |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Ids.php               |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Ids/Map.php           |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Ids/Pop3.php          |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Interaction/Client.php      |    6 +-
 .../Imap_Client/lib/Horde/Imap/Client/Interaction/Server.php      |    6 +-
 .../lib/Horde/Imap/Client/Interaction/Server/Continuation.php     |    6 +-
 .../lib/Horde/Imap/Client/Interaction/Server/Tagged.php           |    6 +-
 .../lib/Horde/Imap/Client/Interaction/Server/Untagged.php         |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Mailbox.php           |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Mailbox/List.php      |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php      |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Catenate.php   |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/ClientSort.php |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php       |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php          |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Translation.php       |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Url.php               |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Utf7imap.php          |    6 +-
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.po  |    2 +-
 framework/Imap_Client/locale/es/LC_MESSAGES/Horde_Imap_Client.po  |    2 +-
 framework/Imap_Client/locale/eu/LC_MESSAGES/Horde_Imap_Client.po  |    2 +-
 framework/Imap_Client/locale/fi/LC_MESSAGES/Horde_Imap_Client.po  |    2 +-
 framework/Imap_Client/locale/nl/LC_MESSAGES/Horde_Imap_Client.po  |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/AclTest.php          |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/AuthTest.php         |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/DataFormatTest.php   |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/DateTimeTest.php     |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/IdsTest.php          |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/MailboxTest.php      |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/MapTest.php          |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/SearchTest.php       |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php       |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/SortTest.php         |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/Stub/DigestMD5.php   |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/Stub/Socket.php      |    2 +-
 .../Imap_Client/test/Horde/Imap/Client/Stub/SocketClientSort.php  |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/SubjectParseTest.php |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/TokenizeTest.php     |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/UrlParseTest.php     |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/Utf7ConvertTest.php  |    2 +-
 framework/Imsp/lib/Horde/Imsp/Auth/Base.php                       |    2 +-
 framework/Imsp/lib/Horde/Imsp/Auth/CramMd5.php                    |    2 +-
 framework/Imsp/lib/Horde/Imsp/Auth/Imtest.php                     |    2 +-
 framework/Imsp/lib/Horde/Imsp/Auth/Plaintext.php                  |    2 +-
 framework/Imsp/lib/Horde/Imsp/Book.php                            |    2 +-
 framework/Imsp/lib/Horde/Imsp/Client/Base.php                     |    2 +-
 framework/Imsp/lib/Horde/Imsp/Client/Socket.php                   |    2 +-
 framework/Imsp/lib/Horde/Imsp/Exception.php                       |    2 +-
 framework/Imsp/lib/Horde/Imsp/Options.php                         |    2 +-
 framework/Imsp/lib/Horde/Imsp/Translation.php                     |    2 +-
 framework/Imsp/locale/ar/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/bg/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/bs/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/ca/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/cs/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/da/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/de/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/el/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/en/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/es/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/et/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/eu/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/fa/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/fi/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/fr/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/gl/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/he/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/hr/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/hu/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/id/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/is/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/it/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/ja/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/km/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/ko/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/lt/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/lv/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/mk/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/nb/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/nl/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/nn/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/pl/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/pt/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/pt_BR/LC_MESSAGES/Horde_Imsp.po             |    2 +-
 framework/Imsp/locale/ro/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/ru/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/sk/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/sl/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/sv/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/tr/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/uk/LC_MESSAGES/Horde_Imsp.po                |    2 +-
 framework/Imsp/locale/zh_CN/LC_MESSAGES/Horde_Imsp.po             |    2 +-
 framework/Imsp/locale/zh_TW/LC_MESSAGES/Horde_Imsp.po             |    2 +-
 framework/Imsp/package.xml                                        |   23 ++-
 framework/Injector/doc/Horde/Injector/COPYING                     |    2 +-
 framework/Itip/doc/Horde/Itip/COPYING                             |   44 ----
 framework/Itip/lib/Horde/Itip/Event.php                           |    2 +-
 framework/Itip/lib/Horde/Itip/Event/Vevent.php                    |    2 +-
 framework/Itip/lib/Horde/Itip/Exception.php                       |    2 +-
 framework/Itip/lib/Horde/Itip/Resource/Identity.php               |    2 +-
 framework/Itip/lib/Horde/Itip/Response.php                        |    2 +-
 framework/Itip/lib/Horde/Itip/Response/Options.php                |    2 +-
 framework/Itip/lib/Horde/Itip/Response/Options/Base.php           |    2 +-
 framework/Itip/lib/Horde/Itip/Response/Options/Horde.php          |    2 +-
 framework/Itip/lib/Horde/Itip/Response/Options/Kolab.php          |    2 +-
 framework/Itip/lib/Horde/Itip/Translation.php                     |    2 +-
 framework/Itip/locale/ar/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/bg/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/bs/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/ca/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/cs/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/da/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/de/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/el/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/en/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/es/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/et/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/eu/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/fa/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/fi/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/fr/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/gl/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/he/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/hr/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/hu/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/id/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/is/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/it/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/ja/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/km/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/ko/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/lt/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/lv/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/mk/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/nb/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/nl/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/nn/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/pl/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/pt/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/pt_BR/LC_MESSAGES/Horde_Itip.po             |    2 +-
 framework/Itip/locale/ro/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/ru/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/sk/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/sl/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/sv/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/tr/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/uk/LC_MESSAGES/Horde_Itip.po                |    2 +-
 framework/Itip/locale/zh_CN/LC_MESSAGES/Horde_Itip.po             |    2 +-
 framework/Itip/locale/zh_TW/LC_MESSAGES/Horde_Itip.po             |    2 +-
 framework/Itip/package.xml                                        |   23 ++-
 framework/Itip/test/Horde/Itip/Stub/Identity.php                  |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli.php                       |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Data/Ledger.php           |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Exception.php             |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module.php                |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Account.php        |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Base.php           |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Data.php           |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php         |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Format.php         |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Ledger.php         |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/List.php           |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Translation.php           |    2 +-
 framework/Kolab_Cli/locale/es/LC_MESSAGES/Horde_Kolab_Cli.po      |    2 +-
 framework/Kolab_Cli/locale/eu/LC_MESSAGES/Horde_Kolab_Cli.po      |    2 +-
 framework/Kolab_Cli/locale/fi/LC_MESSAGES/Horde_Kolab_Cli.po      |    2 +-
 framework/Kolab_Cli/locale/ja/LC_MESSAGES/Horde_Kolab_Cli.po      |    2 +-
 framework/Kolab_Cli/locale/lv/LC_MESSAGES/Horde_Kolab_Cli.po      |    2 +-
 framework/Kolab_Cli/locale/pt_BR/LC_MESSAGES/Horde_Kolab_Cli.po   |    2 +-
 framework/Kolab_Cli/test/Horde/Kolab/Cli/TestCase.php             |    2 +-
 .../Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/Module/BaseTest.php   |    2 +-
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/ModuleTest.php  |    2 +-
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/OptionsTest.php |    2 +-
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/CliTest.php         |    2 +-
 framework/Kolab_Config/test/Horde/Kolab/Config/Autoload.php       |    2 +-
 .../Kolab_Filter/lib/Horde/Kolab/Filter/Transport/LMTPTLS.php     |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Test/Filter.php            |    4 +-
 framework/Kolab_Filter/po/Kolab_Filter.pot                        |    2 +-
 framework/Kolab_Filter/test/Horde/Kolab/Filter/Autoload.php       |    2 +-
 .../Kolab_Filter/test/Horde/Kolab/Filter/Helper/AddressFilter.php |    2 +-
 .../test/Horde/Kolab/Filter/Unit/Helper/AddressFilter.php         |    2 +-
 .../Kolab_Format/doc/Horde/Kolab/Format/examples/new_type.php     |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format.php                 |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Date.php            |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Decorator/Base.php  |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Decorator/Memory.php      |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Decorator/Timed.php |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Exception.php       |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Exception/InvalidRoot.php |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Exception/MissingUid.php  |    2 +-
 .../lib/Horde/Kolab/Format/Exception/MissingValue.php             |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Exception/ParseError.php  |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Factory.php         |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml.php             |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php  |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Envelope.php    |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Helper.php      |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Hprefs.php      |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Note.php        |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Parser.php      |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Task.php        |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/AddressType.php  |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/AttendeeRole.php |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/AttendeeStatus.php            |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/AutomaticDate.php             |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/AutomaticDate/V1.php          |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Base.php   |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Boolean.php      |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Boolean/True.php |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Color.php  |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Color/Background.php          |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Color/Foreground.php          |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Composite.php    |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Composite/Address.php         |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Composite/Attendee.php        |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Composite/Name.php            |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Composite/Phone.php           |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Composite/Recurrence.php      |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Composite/Recurrence/V1.php   |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Composite/SimplePerson.php    |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/CreationDate.php |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/CreationDate/V1.php           |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Date.php   |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Date/V1.php      |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/DateTime.php     |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/DateTime/V1.php  |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/EventDate.php    |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/EventDate/V1.php |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/EventDateTime.php             |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/EventDateTime/V1.php          |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Integer.php      |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/ModificationDate.php          |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Multiple.php     |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Multiple/Address.php          |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Multiple/Attendee.php         |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Multiple/Boolean.php          |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Multiple/Date.php             |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Multiple/Phone.php            |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Multiple/SimplePerson.php     |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/Multiple/String.php           |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/PhoneType.php    |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/PrefsApplication.php          |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/ProductId.php    |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/RecurrenceInterval.php        |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/RecurrenceRange.php           |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/RecurrenceRange/V1.php        |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Root.php   |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Sensitivity.php  |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/String.php |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/String/Empty.php |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/String/Empty/List.php         |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/String/MaybeMissing.php       |    2 +-
 .../lib/Horde/Kolab/Format/Xml/Type/TaskCompletion.php            |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/TaskPriority.php |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/TaskStatus.php   |    2 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Uid.php    |    2 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/XmlAppend.php    |    2 +-
 framework/Kolab_Format/package.xml                                |   24 ++-
 framework/Kolab_Format/test/Horde/Kolab/Format/Autoload.php       |    2 +-
 .../test/Horde/Kolab/Format/Integration/ContactTest.php           |    2 +-
 .../test/Horde/Kolab/Format/Integration/EventTest.php             |    2 +-
 .../test/Horde/Kolab/Format/Integration/PreferencesTest.php       |    2 +-
 .../test/Horde/Kolab/Format/Integration/RecurrenceTest.php        |    2 +-
 .../Kolab_Format/test/Horde/Kolab/Format/Integration/TaskTest.php |    2 +-
 .../Kolab_Format/test/Horde/Kolab/Format/Integration/XmlTest.php  |    2 +-
 framework/Kolab_Format/test/Horde/Kolab/Format/Stub/Dummy.php     |    2 +-
 framework/Kolab_Format/test/Horde/Kolab/Format/TestCase.php       |    2 +-
 framework/Kolab_Format/test/Horde/Kolab/Format/Unit/DateTest.php  |    2 +-
 .../test/Horde/Kolab/Format/Unit/Decorator/MemoryTest.php         |    2 +-
 .../test/Horde/Kolab/Format/Unit/Decorator/TimedTest.php          |    2 +-
 .../test/Horde/Kolab/Format/Unit/Exception/MissingUidTest.php     |    2 +-
 .../test/Horde/Kolab/Format/Unit/Exception/MissingValueTest.php   |    2 +-
 .../test/Horde/Kolab/Format/Unit/Exception/ParseErrorTest.php     |    2 +-
 .../Kolab_Format/test/Horde/Kolab/Format/Unit/FactoryTest.php     |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/EnvelopeTest.php             |    2 +-
 .../Kolab_Format/test/Horde/Kolab/Format/Unit/Xml/ParserTest.php  |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/BooleanTest.php         |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/ColorTest.php           |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/CompositeTest.php       |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/CreationDateTest.php    |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/DateTimeTest.php        |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/IntegerTest.php         |    2 +-
 .../Horde/Kolab/Format/Unit/Xml/Type/ModificationDateTest.php     |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/MultipleTest.php        |    2 +-
 .../Horde/Kolab/Format/Unit/Xml/Type/PrefsApplicationTest.php     |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/ProductIdTest.php       |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/RecurrenceTest.php      |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/RootTest.php            |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/StringTest.php          |    2 +-
 .../test/Horde/Kolab/Format/Unit/Xml/Type/UidTest.php             |    2 +-
 framework/Kolab_Format/test/Horde/Kolab/Format/Unit/XmlTest.php   |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy.php             |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache/Base.php  |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Controller/Base.php   |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Controller/MatchDict.php             |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Controller/NotFound.php              |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Controller/RequestConfiguration.php  |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Driver/Base.php |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Driver/Freebusy/Base.php             |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Driver/Freebusy/Interface.php        |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Driver/Freebusy/Kolab.php            |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Driver/Interface.php  |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Exception.php   |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Exception/NotFound.php               |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Exception/Unauthorized.php           |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Export/Freebusy.php   |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Export/Freebusy/Backend.php          |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Export/Freebusy/Backend/Kolab.php    |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php             |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Export/Freebusy/Decorator/Log.php    |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Factory.php     |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Factory/Base.php      |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Freebusy/Factory/Base.php            |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Freebusy/Factory/Kolab.php           |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Freebusy/Helper/Owa.php              |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Freebusy/Owner.php    |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Freebusy/Owner/Kolab.php             |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Freebusy/Params/Folder.php           |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Object/Event.php      |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Owner.php       |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Owner/Kolab.php |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Params/Freebusy/Resource/Kolab.php   |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Params/Owner.php      |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Params/Resource.php   |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Params/User.php |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Provider.php    |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Provider/Local.php    |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Provider/Remote.php   |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Provider/Remote/PassThrough.php      |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Provider/Remote/Redirect.php         |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Resource.php    |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Resource/Decorator/Log.php           |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Resource/Decorator/Mcache.php        |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Resource/Event.php    |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Resource/Event/Decorator/Log.php     |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Resource/Event/Decorator/Mcache.php  |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Resource/Event/Kolab.php             |    2 +-
 .../lib/Horde/Kolab/FreeBusy/Resource/Event/Owa.php               |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Resource/Kolab.php    |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Translation.php |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/User.php        |    2 +-
 .../Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/User/Anonymous.php    |    2 +-
 .../lib/Horde/Kolab/FreeBusy/User/Decorator/Log.php               |    2 +-
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/User/Kolab.php  |    2 +-
 .../Kolab_FreeBusy/locale/ar/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/bg/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/bs/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/ca/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/cs/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/da/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/de/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/el/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/en/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/es/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/et/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/eu/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/fa/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/fi/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/fr/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/gl/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/he/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/hr/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/hu/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/id/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/is/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/it/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/ja/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/km/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/ko/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/lt/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/lv/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/mk/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/nb/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/nl/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/nn/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/pl/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/pt/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../locale/pt_BR/LC_MESSAGES/Horde_Kolab_FreeBusy.po              |    2 +-
 .../Kolab_FreeBusy/locale/ro/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/ru/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/sk/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/sl/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/sv/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/tr/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../Kolab_FreeBusy/locale/uk/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |    2 +-
 .../locale/zh_CN/LC_MESSAGES/Horde_Kolab_FreeBusy.po              |    2 +-
 .../locale/zh_TW/LC_MESSAGES/Horde_Kolab_FreeBusy.po              |    2 +-
 .../test/Horde/Kolab/FreeBusy/Integration/DispatchTest.php        |    2 +-
 .../test/Horde/Kolab/FreeBusy/Integration/FreeBusy.php            |    2 +-
 .../Horde/Kolab/FreeBusy/Integration/FreeBusyScenarioTest.php     |    2 +-
 .../test/Horde/Kolab/FreeBusy/Integration/FreeBusyTest.php        |    2 +-
 .../test/Horde/Kolab/FreeBusy/Integration/RedirectTest.php        |    2 +-
 .../test/Horde/Kolab/FreeBusy/Integration/TriggerTest.php         |    2 +-
 framework/Kolab_FreeBusy/test/Horde/Kolab/FreeBusy/TestCase.php   |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Controller/MatchDictTest.php   |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Factory/BaseTest.php           |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/FreeBusyTest.php               |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Freebusy/Factory/BaseTest.php  |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Freebusy/Helper/OwaTest.php    |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Freebusy/Params/FolderTest.php |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Owner/Freebusy/KolabTest.php   |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Params/UserTest.php            |    2 +-
 .../Horde/Kolab/FreeBusy/Unit/Provider/Remote/PassThroughTest.php |    2 +-
 .../Horde/Kolab/FreeBusy/Unit/Provider/Remote/RedirectTest.php    |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Resource/Event/KolabTest.php   |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Resource/Event/OwaTest.php     |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Resource/KolabTest.php         |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/User/AnonymousTest.php         |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/User/Decorator/LogTest.php     |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/User/KolabTest.php             |    2 +-
 framework/Kolab_FreeBusy/www/Horde/Kolab/FreeBusy/config.php      |    2 +-
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php   |    2 +-
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Translation.php |    2 +-
 .../Kolab_Resource/locale/ar/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/bg/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/bs/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/ca/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/cs/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/da/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/de/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/el/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/en/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/es/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/et/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/eu/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/fa/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/fi/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/fr/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/gl/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/he/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/hr/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/hu/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/id/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/is/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/it/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/ja/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/km/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/ko/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/lt/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/lv/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/mk/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/nb/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/nl/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/nn/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/pl/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/pt/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../locale/pt_BR/LC_MESSAGES/Horde_Kolab_Resource.po              |    2 +-
 .../Kolab_Resource/locale/ro/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/ru/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/sk/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/sl/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/sv/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/tr/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../Kolab_Resource/locale/uk/LC_MESSAGES/Horde_Kolab_Resource.po  |    2 +-
 .../locale/zh_CN/LC_MESSAGES/Horde_Kolab_Resource.po              |    2 +-
 .../locale/zh_TW/LC_MESSAGES/Horde_Kolab_Resource.po              |    2 +-
 framework/Kolab_Resource/test/Horde/Kolab/Resource/Autoload.php   |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Composite.php       |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Connection/File.php |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Connection/Interface.php  |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Connection/Mock.php |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Connection/Mock/Ldap.php  |    2 +-
 .../lib/Horde/Kolab/Server/Connection/Mock/Search.php             |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Connection/Simpleldap.php |    2 +-
 .../lib/Horde/Kolab/Server/Connection/Splittedldap.php            |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Decorator/Clean.php |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Decorator/Count.php |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Decorator/Log.php   |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Decorator/Map.php   |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Exception.php       |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Exception/Bindfailed.php  |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Exception/Novalue.php     |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Factory.php         |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Interface.php       |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php            |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap/Changes.php    |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap/Filtered.php   |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap/Standard.php   |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/List/Base.php       |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/List/Interface.php  |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Object/Attribute/Base.php |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Createtimestamp.php   |    2 +-
 .../Horde/Kolab/Server/Object/Attribute/Createtimestampdate.php   |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Decorator.php         |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Default.php           |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Empty.php             |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/External.php          |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Field.php             |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Firstnamelastname.php |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Object/Attribute/Guid.php |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Object/Attribute/Id.php   |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Interface.php         |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Internal.php          |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Locked.php            |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Modifytimestamp.php   |    2 +-
 .../Horde/Kolab/Server/Object/Attribute/Modifytimestampdate.php   |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Objectclass.php       |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Openldapaci.php       |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Required.php          |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Single.php            |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Value.php             |    2 +-
 .../lib/Horde/Kolab/Server/Object/Attribute/Writelock.php         |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Base.php     |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Factory.php  |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Object/Groupofnames.php   |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Hash.php     |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Object/Inetorgperson.php  |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Object/Interface.php      |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab.php    |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Address.php  |    2 +-
 .../lib/Horde/Kolab/Server/Object/Kolab/Administrator.php         |    2 +-
 .../lib/Horde/Kolab/Server/Object/Kolab/Adminrole.php             |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Distlist.php |    2 +-
 .../lib/Horde/Kolab/Server/Object/Kolab/Domainmaintainer.php      |    4 +-
 .../lib/Horde/Kolab/Server/Object/Kolab/Maintainer.php            |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/User.php     |    2 +-
 .../lib/Horde/Kolab/Server/Object/Kolabgermanbankarrangement.php  |    2 +-
 .../lib/Horde/Kolab/Server/Object/Kolabgroupofnames.php           |    2 +-
 .../lib/Horde/Kolab/Server/Object/Kolabinetorgperson.php          |    2 +-
 .../lib/Horde/Kolab/Server/Object/Kolabpop3account.php            |    2 +-
 .../lib/Horde/Kolab/Server/Object/Kolabsharedfolder.php           |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Mcached.php  |    2 +-
 .../lib/Horde/Kolab/Server/Object/Organizationalperson.php        |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Person.php   |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Searches.php |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Top.php      |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Base.php    |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Objects/Interface.php     |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/And.php     |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Approx.php  |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Begins.php  |    2 +-
 .../lib/Horde/Kolab/Server/Query/Element/Contains.php             |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Ends.php    |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Equals.php  |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Greater.php |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Group.php   |    2 +-
 .../lib/Horde/Kolab/Server/Query/Element/Interface.php            |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Less.php    |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Mapped.php  |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Not.php     |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Or.php      |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Query/Element/Single.php  |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Query/Interface.php |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Query/Ldap.php      |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Result/Interface.php      |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Result/Ldap.php     |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Base.php     |    2 +-
 .../lib/Horde/Kolab/Server/Schema/Decorator/Cache.php             |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Schema/Interface.php      |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Search/Base.php     |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Search/Interface.php      |    2 +-
 .../Horde/Kolab/Server/Search/Operation/Addressesforuidormail.php |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Attributes.php        |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Search/Operation/Base.php |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Children.php          |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Constraint/Single.php |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Constraint/Strict.php |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Groupsformember.php   |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Search/Operation/Guid.php |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Guidforalias.php      |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Guidforcn.php         |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Guidforkolabusers.php |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Guidformail.php       |    2 +-
 .../Horde/Kolab/Server/Search/Operation/Guidformailoralias.php    |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Guidforuid.php        |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Guidforuidormail.php  |    2 +-
 .../Kolab/Server/Search/Operation/Guidforuidormailoralias.php     |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Interface.php         |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Mailforuidormail.php  |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Restrictgroups.php    |    2 +-
 .../lib/Horde/Kolab/Server/Search/Operation/Restrictkolab.php     |    2 +-
 .../lib/Horde/Kolab/Server/Structure/Attribute/Double.php         |    2 +-
 .../lib/Horde/Kolab/Server/Structure/Attribute/Interface.php      |    2 +-
 .../lib/Horde/Kolab/Server/Structure/Attribute/Value.php          |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Base.php  |    2 +-
 .../Kolab_Server/lib/Horde/Kolab/Server/Structure/Interface.php   |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Kolab.php |    2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Ldap.php  |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Composite/BaseTest.php   |    2 +-
 .../Horde/Kolab/Server/Class/Server/Connection/Mock/LdapTest.php  |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Connection/MockTest.php  |    2 +-
 .../Horde/Kolab/Server/Class/Server/Connection/SimpleldapTest.php |    2 +-
 .../Kolab/Server/Class/Server/Connection/SplittedldapTest.php     |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Decorator/CleanTest.php  |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Decorator/LogTest.php    |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Ldap/ChangesTest.php     |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Ldap/FilteredTest.php    |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Ldap/StandardTest.php    |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/LdapTest.php             |    2 +-
 .../Horde/Kolab/Server/Class/Server/Object/Attribute/BaseTest.php |    2 +-
 .../Kolab/Server/Class/Server/Object/Attribute/ValueTest.php      |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Object/BaseTest.php      |    2 +-
 .../Horde/Kolab/Server/Class/Server/Query/Element/MappedTest.php  |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Query/ElementTest.php    |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Query/LdapTest.php       |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Result/LdapTest.php      |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Search/BaseTest.php      |    2 +-
 .../Horde/Kolab/Server/Class/Server/Search/Operation/GuidTest.php |    2 +-
 .../Server/Class/Server/Search/Operation/GuidforaliasTest.php     |    2 +-
 .../Kolab/Server/Class/Server/Search/Operation/GuidforcnTest.php  |    2 +-
 .../Server/Class/Server/Search/Operation/GuidformailTest.php      |    2 +-
 .../Kolab/Server/Class/Server/Search/Operation/GuidforuidTest.php |    2 +-
 .../Server/Class/Server/Search/Operation/RestrictgroupsTest.php   |    2 +-
 .../Server/Class/Server/Search/Operation/RestrictkolabTest.php    |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Structure/KolabTest.php  |    2 +-
 .../test/Horde/Kolab/Server/Class/Server/Structure/LdapTest.php   |    2 +-
 .../test/Horde/Kolab/Server/Integration/AddingObjectsTest.php     |    2 +-
 .../test/Horde/Kolab/Server/Integration/AdminTest.php             |    2 +-
 .../test/Horde/Kolab/Server/Integration/DistListHandlingTest.php  |    2 +-
 .../test/Horde/Kolab/Server/Integration/GroupHandlingTestTodo.php |    2 +-
 .../test/Horde/Kolab/Server/Integration/GroupTest.php             |    2 +-
 .../test/Horde/Kolab/Server/Integration/InetorgpersonTest.php     |    2 +-
 .../Kolab/Server/Integration/KolabgermanbankarrangementTest.php   |    2 +-
 .../Horde/Kolab/Server/Integration/KolabinetorgpersonTest.php     |    2 +-
 .../test/Horde/Kolab/Server/Integration/Kolabpop3accountTest.php  |    2 +-
 .../Kolab_Server/test/Horde/Kolab/Server/Integration/MockTest.php |    2 +-
 .../test/Horde/Kolab/Server/Integration/ObjectTest.php            |    4 +-
 .../test/Horde/Kolab/Server/Integration/ObjectsTest.php           |    2 +-
 .../test/Horde/Kolab/Server/Integration/OrgPersonTest.php         |    2 +-
 .../test/Horde/Kolab/Server/Integration/PersonTest.php            |    2 +-
 .../Kolab_Server/test/Horde/Kolab/Server/Integration/Scenario.php |    2 +-
 .../test/Horde/Kolab/Server/Integration/SearchTest.php            |    2 +-
 .../Horde/Kolab/Server/Integration/SearchguidforuidormailTest.php |    2 +-
 .../test/Horde/Kolab/Server/Integration/UserHandlingTestTodo.php  |    2 +-
 .../Kolab_Server/test/Horde/Kolab/Server/Integration/UserTest.php |    2 +-
 framework/Kolab_Server/test/Horde/Kolab/Server/LdapTestCase.php   |    2 +-
 framework/Kolab_Server/test/Horde/Kolab/Server/TestCase.php       |    2 +-
 framework/Kolab_Session/lib/Horde/Kolab/Session.php               |    2 +-
 framework/Kolab_Session/lib/Horde/Kolab/Session/Abstract.php      |    2 +-
 framework/Kolab_Session/lib/Horde/Kolab/Session/Base.php          |    2 +-
 .../Kolab_Session/lib/Horde/Kolab/Session/Decorator/Anonymous.php |    2 +-
 .../Kolab_Session/lib/Horde/Kolab/Session/Decorator/Base.php      |    2 +-
 .../Kolab_Session/lib/Horde/Kolab/Session/Decorator/Logged.php    |    2 +-
 .../Kolab_Session/lib/Horde/Kolab/Session/Decorator/Stored.php    |    2 +-
 framework/Kolab_Session/lib/Horde/Kolab/Session/Exception.php     |    2 +-
 .../Kolab_Session/lib/Horde/Kolab/Session/Exception/Badlogin.php  |    2 +-
 framework/Kolab_Session/lib/Horde/Kolab/Session/Factory/Imap.php  |    2 +-
 framework/Kolab_Session/lib/Horde/Kolab/Session/Imap.php          |    2 +-
 framework/Kolab_Session/lib/Horde/Kolab/Session/Storage.php       |    2 +-
 framework/Kolab_Session/lib/Horde/Kolab/Session/Storage/Mock.php  |    2 +-
 .../Kolab_Session/lib/Horde/Kolab/Session/Storage/Session.php     |    2 +-
 framework/Kolab_Session/lib/Horde/Kolab/Session/Valid.php         |    2 +-
 framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Base.php    |    2 +-
 .../lib/Horde/Kolab/Session/Valid/Decorator/Logged.php            |    2 +-
 .../test/Horde/Kolab/Session/Integration/AnonymousTest.php        |    2 +-
 .../test/Horde/Kolab/Session/Integration/ValidTest.php            |    2 +-
 framework/Kolab_Session/test/Horde/Kolab/Session/TestCase.php     |    2 +-
 .../Kolab_Session/test/Horde/Kolab/Session/Unit/BaseTest.php      |    2 +-
 .../test/Horde/Kolab/Session/Unit/Decorator/AnonymousTest.php     |    2 +-
 .../test/Horde/Kolab/Session/Unit/Decorator/BaseTest.php          |    2 +-
 .../test/Horde/Kolab/Session/Unit/Decorator/LoggedTest.php        |    2 +-
 .../test/Horde/Kolab/Session/Unit/Decorator/StoredTest.php        |    2 +-
 .../Kolab_Session/test/Horde/Kolab/Session/Unit/ImapTest.php      |    2 +-
 .../test/Horde/Kolab/Session/Unit/Storage/MockTest.php            |    2 +-
 .../test/Horde/Kolab/Session/Unit/Storage/SessionTest.php         |    2 +-
 .../test/Horde/Kolab/Session/Unit/Valid/BaseTest.php              |    2 +-
 .../test/Horde/Kolab/Session/Unit/Valid/Decorator/LoggedTest.php  |    2 +-
 framework/Kolab_Storage/doc/Horde/Kolab/Storage/OLD/Folder.php    |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage.php               |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Base.php          |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cache.php         |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cache/Data.php    |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cached.php        |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data.php          |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php     |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Cached.php   |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Data/Decorator/Log.php  |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Data/Exception.php      |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Old.php      |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query.php    |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/History.php  |    2 +-
 .../lib/Horde/Kolab/Storage/Data/Query/History/Base.php           |    2 +-
 .../lib/Horde/Kolab/Storage/Data/Query/History/Cache.php          |    2 +-
 .../lib/Horde/Kolab/Storage/Data/Query/Preferences.php            |    2 +-
 .../lib/Horde/Kolab/Storage/Data/Query/Preferences/Base.php       |    2 +-
 .../lib/Horde/Kolab/Storage/Data/Query/Preferences/Cache.php      |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Decorator/Log.php |    2 +-
 .../lib/Horde/Kolab/Storage/Decorator/Synchronization.php         |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver.php        |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php   |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Cclient.php      |    2 +-
 .../lib/Horde/Kolab/Storage/Driver/Decorator/Base.php             |    2 +-
 .../lib/Horde/Kolab/Storage/Driver/Decorator/Log.php              |    2 +-
 .../lib/Horde/Kolab/Storage/Driver/Decorator/Timer.php            |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php   |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Mock.php   |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Mock/Data.php    |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php   |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Rcube.php  |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Exception.php     |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Exception/Pear.php      |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Factory.php       |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php        |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Base.php   |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Data.php   |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Namespace.php    |    2 +-
 .../lib/Horde/Kolab/Storage/Folder/Namespace/Config.php           |    2 +-
 .../lib/Horde/Kolab/Storage/Folder/Namespace/Element.php          |    2 +-
 .../lib/Horde/Kolab/Storage/Folder/Namespace/Element/Other.php    |    2 +-
 .../lib/Horde/Kolab/Storage/Folder/Namespace/Element/Personal.php |    2 +-
 .../lib/Horde/Kolab/Storage/Folder/Namespace/Element/Shared.php   |    2 +-
 .../Kolab/Storage/Folder/Namespace/Element/SharedWithPrefix.php   |    2 +-
 .../lib/Horde/Kolab/Storage/Folder/Namespace/Fixed.php            |    2 +-
 .../lib/Horde/Kolab/Storage/Folder/Namespace/Imap.php             |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Stamp.php  |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Stamp/Uids.php   |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Type.php   |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Types.php  |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Cache.php    |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/List/Exception.php      |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/List/Manipulation.php   |    2 +-
 .../lib/Horde/Kolab/Storage/List/Manipulation/Base.php            |    2 +-
 .../lib/Horde/Kolab/Storage/List/Manipulation/Decorator/Log.php   |    2 +-
 .../lib/Horde/Kolab/Storage/List/Manipulation/Listener.php        |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Acl.php      |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Acl/Base.php |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/Acl/Cache.php              |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/ActiveSync.php             |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/ActiveSync/Base.php        |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/ActiveSync/Cache.php       |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/List.php     |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/List/Base.php              |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/List/Cache.php             |    2 +-
 .../Horde/Kolab/Storage/List/Query/List/Cache/Synchronization.php |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/List/Defaults.php          |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/List/Defaults/Bail.php     |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/List/Defaults/Log.php      |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Share.php    |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/Share/Base.php             |    2 +-
 .../lib/Horde/Kolab/Storage/List/Query/Share/Cache.php            |    2 +-
 .../lib/Horde/Kolab/Storage/List/Synchronization.php              |    2 +-
 .../lib/Horde/Kolab/Storage/List/Synchronization/Base.php         |    2 +-
 .../Horde/Kolab/Storage/List/Synchronization/Decorator/Log.php    |    2 +-
 .../lib/Horde/Kolab/Storage/List/Synchronization/Listener.php     |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Tools.php    |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Object.php        |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Object/Exception.php    |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Object/MimeType.php     |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Object/Writer.php |    2 +-
 .../lib/Horde/Kolab/Storage/Object/Writer/Format.php              |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Object/Writer/Raw.php   |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Queriable.php     |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Query.php         |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/QuerySet.php      |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/QuerySet/Base.php |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/QuerySet/Cached.php     |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/QuerySet/Uncached.php   |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Synchronization.php     |    2 +-
 .../lib/Horde/Kolab/Storage/Synchronization/OncePerSession.php    |    2 +-
 .../lib/Horde/Kolab/Storage/Synchronization/TimeBased.php         |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Translation.php   |    2 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Uncached.php      |    2 +-
 .../Kolab_Storage/locale/ar/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/bg/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/bs/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/ca/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/cs/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/da/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/de/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/el/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/en/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/es/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/et/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/eu/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/fa/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/fi/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/fr/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/gl/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/he/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/hr/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/hu/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/id/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/is/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/it/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/ja/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/km/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/ko/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/lt/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/lv/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/mk/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/nb/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/nl/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/nn/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/pl/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/pt/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/pt_BR/LC_MESSAGES/Horde_Kolab_Storage.po |    2 +-
 .../Kolab_Storage/locale/ro/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/ru/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/sk/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/sl/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/sv/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/tr/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/uk/LC_MESSAGES/Horde_Kolab_Storage.po    |    2 +-
 .../Kolab_Storage/locale/zh_CN/LC_MESSAGES/Horde_Kolab_Storage.po |    2 +-
 .../Kolab_Storage/locale/zh_TW/LC_MESSAGES/Horde_Kolab_Storage.po |    2 +-
 framework/Kolab_Storage/package.xml                               |   23 ++-
 .../Kolab_Storage/test/Horde/Kolab/Storage/AttachmentTest.php     |    2 +-
 .../Storage/ComponentTest/Data/Object/Message/ModifiedTest.php    |    2 +-
 .../Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php   |    2 +-
 .../test/Horde/Kolab/Storage/ComponentTest/List/CacheTest.php     |    2 +-
 .../Horde/Kolab/Storage/ComponentTest/List/Query/Acl/BaseTest.php |    2 +-
 .../Kolab/Storage/ComponentTest/List/Query/List/BaseTest.php      |    2 +-
 .../Kolab/Storage/ComponentTest/List/Query/List/CacheTest.php     |    2 +-
 framework/Kolab_Storage/test/Horde/Kolab/Storage/Scenario.php     |    2 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Server/DriverTest.php  |    2 +-
 framework/Kolab_Storage/test/Horde/Kolab/Storage/TestCase.php     |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Cache/DataTest.php              |    2 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/CacheTest.php     |    2 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/CachedTest.php    |    2 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/Data/BaseTest.php |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Data/CachedTest.php             |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Data/Decorator/LogTest.php      |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Data/Query/History/BaseTest.php |    2 +-
 .../Horde/Kolab/Storage/Unit/Data/Query/Preferences/BaseTest.php  |    2 +-
 .../Horde/Kolab/Storage/Unit/Data/Query/Preferences/CacheTest.php |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Decorator/LogTest.php           |    2 +-
 .../Horde/Kolab/Storage/Unit/Decorator/SynchronizationTest.php    |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Driver/CclientTest.php          |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Driver/Decorator/LogTest.php    |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Driver/Decorator/TimerTest.php  |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php             |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Driver/MockTest.php             |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Driver/PearTest.php             |    2 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/FactoryTest.php   |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Folder/BaseTest.php             |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Folder/DataTest.php             |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Folder/NamespaceTest.php        |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Folder/Stamp/UidsTest.php       |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Folder/TypeTest.php             |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Folder/TypesTest.php            |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/Manipulation/BaseTest.php  |    2 +-
 .../Kolab/Storage/Unit/List/Manipulation/Decorator/LogTest.php    |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/Acl/BaseTest.php     |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/Acl/CacheTest.php    |    2 +-
 .../Horde/Kolab/Storage/Unit/List/Query/ActiveSync/BaseTest.php   |    2 +-
 .../Horde/Kolab/Storage/Unit/List/Query/ActiveSync/CacheTest.php  |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/List/BaseTest.php    |    2 +-
 .../Storage/Unit/List/Query/List/Cache/SynchronizationTest.php    |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/List/CacheTest.php   |    2 +-
 .../Horde/Kolab/Storage/Unit/List/Query/List/DefaultsTest.php     |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/Share/BaseTest.php   |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/Share/CacheTest.php  |    2 +-
 .../Horde/Kolab/Storage/Unit/List/Synchronization/BaseTest.php    |    2 +-
 .../Kolab/Storage/Unit/List/Synchronization/Decorator/LogTest.php |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/ToolsTest.php              |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Object/MimeTypeTest.php         |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Object/Writer/FormatTest.php    |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Object/Writer/RawTest.php       |    2 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/ObjectTest.php    |    2 +-
 .../test/Horde/Kolab/Storage/Unit/QuerySet/UncachedTest.php       |    2 +-
 .../Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php     |    2 +-
 .../Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php    |    2 +-
 .../test/Horde/Kolab/Storage/Unit/SynchronizationTest.php         |    2 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/UncachedTest.php  |    2 +-
 framework/Ldap/lib/Horde/Ldap.php                                 |    2 +-
 framework/Ldap/lib/Horde/Ldap/Entry.php                           |    2 +-
 framework/Ldap/lib/Horde/Ldap/Exception.php                       |    2 +-
 framework/Ldap/lib/Horde/Ldap/Filter.php                          |    2 +-
 framework/Ldap/lib/Horde/Ldap/Ldif.php                            |    2 +-
 framework/Ldap/lib/Horde/Ldap/RootDse.php                         |    2 +-
 framework/Ldap/lib/Horde/Ldap/Schema.php                          |    2 +-
 framework/Ldap/lib/Horde/Ldap/Search.php                          |    2 +-
 framework/Ldap/lib/Horde/Ldap/Util.php                            |    2 +-
 framework/Ldap/test/Horde/Ldap/EntryTest.php                      |    2 +-
 framework/Ldap/test/Horde/Ldap/FilterTest.php                     |    2 +-
 framework/Ldap/test/Horde/Ldap/LdapTest.php                       |    2 +-
 framework/Ldap/test/Horde/Ldap/LdifTest.php                       |    2 +-
 framework/Ldap/test/Horde/Ldap/SearchTest.php                     |    2 +-
 framework/Ldap/test/Horde/Ldap/TestBase.php                       |    2 +-
 framework/Ldap/test/Horde/Ldap/UtilTest.php                       |    2 +-
 framework/ListHeaders/lib/Horde/ListHeaders.php                   |    2 +-
 framework/ListHeaders/lib/Horde/ListHeaders/Base.php              |    2 +-
 framework/ListHeaders/lib/Horde/ListHeaders/Id.php                |    2 +-
 framework/ListHeaders/lib/Horde/ListHeaders/NoPost.php            |    2 +-
 framework/ListHeaders/lib/Horde/ListHeaders/Object.php            |    2 +-
 framework/Lock/lib/Horde/Lock.php                                 |    2 +-
 framework/Lock/lib/Horde/Lock/Exception.php                       |    2 +-
 framework/Lock/lib/Horde/Lock/Null.php                            |    2 +-
 framework/Lock/lib/Horde/Lock/Sql.php                             |    2 +-
 framework/Log/doc/Horde/Log/COPYING                               |    2 +-
 framework/LoginTasks/lib/Horde/LoginTasks.php                     |    2 +-
 framework/LoginTasks/lib/Horde/LoginTasks/Backend.php             |    2 +-
 framework/LoginTasks/lib/Horde/LoginTasks/SystemTask.php          |    2 +-
 framework/LoginTasks/lib/Horde/LoginTasks/Task.php                |    2 +-
 framework/LoginTasks/lib/Horde/LoginTasks/Tasklist.php            |    2 +-
 framework/LoginTasks/lib/Horde/LoginTasks/Translation.php         |    2 +-
 framework/LoginTasks/locale/ar/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/bg/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/bs/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/ca/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/cs/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/da/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/de/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/el/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/en/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/es/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/et/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/eu/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/fa/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/fi/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/fr/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/gl/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/he/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/hr/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/hu/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/id/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/is/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/it/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/ja/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/km/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/ko/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/lt/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/lv/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/mk/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/nb/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/nl/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/nn/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/pl/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/pt/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/pt_BR/LC_MESSAGES/Horde_LoginTasks.po |    2 +-
 framework/LoginTasks/locale/ro/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/ru/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/sk/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/sl/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/sv/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/tr/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/uk/LC_MESSAGES/Horde_LoginTasks.po    |    2 +-
 framework/LoginTasks/locale/zh_CN/LC_MESSAGES/Horde_LoginTasks.po |    2 +-
 framework/LoginTasks/locale/zh_TW/LC_MESSAGES/Horde_LoginTasks.po |    2 +-
 framework/LoginTasks/package.xml                                  |   23 ++-
 framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php     |    2 +-
 framework/Mail/doc/Horde/Mail/COPYING                             |    2 +-
 framework/Mail/lib/Horde/Mail/Exception.php                       |    6 +-
 framework/Mail/lib/Horde/Mail/Rfc822.php                          |    6 +-
 framework/Mail/lib/Horde/Mail/Rfc822/Address.php                  |    6 +-
 framework/Mail/lib/Horde/Mail/Rfc822/Group.php                    |    6 +-
 framework/Mail/lib/Horde/Mail/Rfc822/GroupList.php                |    6 +-
 framework/Mail/lib/Horde/Mail/Rfc822/List.php                     |    6 +-
 framework/Mail/lib/Horde/Mail/Rfc822/Object.php                   |    6 +-
 framework/Mail/lib/Horde/Mail/Transport.php                       |    9 +-
 framework/Mail/lib/Horde/Mail/Transport/Mail.php                  |    9 +-
 framework/Mail/lib/Horde/Mail/Transport/Mock.php                  |    8 +-
 framework/Mail/lib/Horde/Mail/Transport/Null.php                  |    6 +-
 framework/Mail/lib/Horde/Mail/Transport/Sendmail.php              |    9 +-
 framework/Mail/lib/Horde/Mail/Transport/Smtp.php                  |    9 +-
 framework/Mail/lib/Horde/Mail/Transport/Smtpmx.php                |   20 +-
 framework/Memcache/lib/Horde/Memcache.php                         |    2 +-
 framework/Memcache/lib/Horde/Memcache/Exception.php               |    2 +-
 framework/Mime/lib/Horde/Mime.php                                 |    2 +-
 framework/Mime/lib/Horde/Mime/Exception.php                       |    2 +-
 framework/Mime/lib/Horde/Mime/Headers.php                         |    2 +-
 framework/Mime/lib/Horde/Mime/Magic.php                           |    2 +-
 framework/Mime/lib/Horde/Mime/Mail.php                            |    2 +-
 framework/Mime/lib/Horde/Mime/Mdn.php                             |    2 +-
 framework/Mime/lib/Horde/Mime/Part.php                            |    2 +-
 framework/Mime/lib/Horde/Mime/Related.php                         |    2 +-
 framework/Mime/lib/Horde/Mime/Translation.php                     |    2 +-
 framework/Mime/locale/ar/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/bg/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/bs/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/ca/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/cs/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/da/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/de/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/el/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/en/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/es/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/et/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/eu/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/fa/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/fi/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/fr/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/gl/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/he/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/hr/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/hu/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/id/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/is/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/it/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/ja/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/km/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/ko/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/lt/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/lv/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/mk/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/nb/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/nl/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/nn/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/pl/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/pt/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/pt_BR/LC_MESSAGES/Horde_Mime.po             |    2 +-
 framework/Mime/locale/ro/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/ru/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/sk/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/sl/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/sv/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/tr/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/uk/LC_MESSAGES/Horde_Mime.po                |    2 +-
 framework/Mime/locale/zh_CN/LC_MESSAGES/Horde_Mime.po             |    2 +-
 framework/Mime/locale/zh_TW/LC_MESSAGES/Horde_Mime.po             |    2 +-
 framework/Mime/test/Horde/Mime/HeadersTest.php                    |    2 +-
 framework/Mime/test/Horde/Mime/MagicTest.php                      |    2 +-
 framework/Mime/test/Horde/Mime/MailTest.php                       |    2 +-
 framework/Mime/test/Horde/Mime/MimeTest.php                       |    2 +-
 framework/Mime/test/Horde/Mime/PartTest.php                       |    2 +-
 framework/Mime/test/Horde/Mime/RelatedTest.php                    |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer.php                   |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Audio.php             |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Base.php              |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Deb.php               |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Default.php           |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Enriched.php          |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Exception.php         |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php              |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Images.php            |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Msexcel.php           |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Mspowerpoint.php      |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Msword.php            |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo.php               |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Pdf.php               |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Plain.php             |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rar.php               |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Report.php            |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rfc822.php            |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Richtext.php          |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rpm.php               |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rtf.php               |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Security.php          |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Simple.php            |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Smil.php              |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Syntaxhighlighter.php |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Tgz.php               |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Tnef.php              |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Translation.php       |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Wordperfect.php       |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Zip.php               |    2 +-
 framework/Mime_Viewer/locale/ar/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/bg/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/bs/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/ca/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/cs/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/da/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/de/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/el/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/en/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/es/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/et/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/eu/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/fa/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/fi/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/fr/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/gl/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/he/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/hr/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/hu/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/id/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/is/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/it/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/ja/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/km/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/ko/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/lt/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/lv/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/mk/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/nb/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/nl/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/nn/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/pl/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/pt/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 .../Mime_Viewer/locale/pt_BR/LC_MESSAGES/Horde_Mime_Viewer.po     |    2 +-
 framework/Mime_Viewer/locale/ro/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/ru/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/sk/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/sl/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/sv/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/tr/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 framework/Mime_Viewer/locale/uk/LC_MESSAGES/Horde_Mime_Viewer.po  |    2 +-
 .../Mime_Viewer/locale/zh_CN/LC_MESSAGES/Horde_Mime_Viewer.po     |    2 +-
 .../Mime_Viewer/locale/zh_TW/LC_MESSAGES/Horde_Mime_Viewer.po     |    2 +-
 framework/Mime_Viewer/package.xml                                 |   26 ++-
 framework/Model/lib/Horde/Core/Form.php                           |    2 +-
 framework/Model/lib/Horde/Core/Form/daterendererchanges.php       |    2 +-
 framework/Model/lib/Horde/Form/VarRenderer.php                    |    2 +-
 framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php              |    2 +-
 framework/Model/lib/Horde/Model/Translation.php                   |    2 +-
 framework/Model/locale/ar/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/bg/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/bs/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/ca/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/cs/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/da/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/de/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/el/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/en/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/es/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/et/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/eu/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/fa/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/fi/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/fr/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/gl/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/he/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/hr/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/hu/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/id/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/is/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/it/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/ja/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/km/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/ko/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/lt/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/lv/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/mk/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/nb/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/nl/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/nn/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/pl/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/pt/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/pt_BR/LC_MESSAGES/Horde_Model.po           |    2 +-
 framework/Model/locale/ro/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/ru/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/sk/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/sl/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/sv/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/tr/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/uk/LC_MESSAGES/Horde_Model.po              |    2 +-
 framework/Model/locale/zh_CN/LC_MESSAGES/Horde_Model.po           |    2 +-
 framework/Model/locale/zh_TW/LC_MESSAGES/Horde_Model.po           |    2 +-
 framework/Nls/lib/Horde/Nls.php                                   |    2 +-
 framework/Nls/lib/Horde/Nls/Geoip.php                             |    2 +-
 framework/Nls/lib/Horde/Nls/Translation.php                       |    2 +-
 framework/Nls/locale/ar/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/bg/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/bs/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/ca/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/cs/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/da/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/de/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/el/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/en/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/es/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/et/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/eu/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/fa/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/fi/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/fr/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/gl/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/he/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/hr/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/hu/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/id/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/is/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/it/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/ja/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/km/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/ko/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/lt/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/lv/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/mk/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/nb/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/nn/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/pl/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/pt/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/pt_BR/LC_MESSAGES/Horde_Nls.po               |    2 +-
 framework/Nls/locale/ro/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/ru/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/sk/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/sl/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/sv/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/tr/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/uk/LC_MESSAGES/Horde_Nls.po                  |    2 +-
 framework/Nls/locale/zh_CN/LC_MESSAGES/Horde_Nls.po               |    2 +-
 framework/Nls/locale/zh_TW/LC_MESSAGES/Horde_Nls.po               |    2 +-
 framework/Nls/package.xml                                         |   23 ++-
 framework/Notification/lib/Horde/Notification.php                 |    2 +-
 framework/Notification/lib/Horde/Notification/Event.php           |    2 +-
 framework/Notification/lib/Horde/Notification/Event/Status.php    |    2 +-
 framework/Notification/lib/Horde/Notification/Exception.php       |    2 +-
 framework/Notification/lib/Horde/Notification/Handler.php         |    2 +-
 .../lib/Horde/Notification/Handler/Decorator/Alarm.php            |    2 +-
 .../lib/Horde/Notification/Handler/Decorator/Base.php             |    2 +-
 .../Notification/lib/Horde/Notification/Handler/Decorator/Log.php |    2 +-
 framework/Notification/lib/Horde/Notification/Listener.php        |    2 +-
 framework/Notification/lib/Horde/Notification/Listener/Audio.php  |    2 +-
 framework/Notification/lib/Horde/Notification/Listener/Status.php |    2 +-
 .../Notification/lib/Horde/Notification/Storage/Interface.php     |    2 +-
 framework/Notification/lib/Horde/Notification/Storage/Object.php  |    2 +-
 framework/Notification/lib/Horde/Notification/Storage/Session.php |    2 +-
 .../Horde/Notification/Class/Notification/Event/StatusTest.php    |    2 +-
 .../test/Horde/Notification/Class/Notification/EventTest.php      |    2 +-
 .../Class/Notification/Handler/Decorator/AlarmTest.php            |    2 +-
 .../Class/Notification/Handler/Decorator/HordelogTest.php         |    2 +-
 .../Notification/Class/Notification/Handler/Decorator/LogTest.php |    2 +-
 .../test/Horde/Notification/Class/Notification/HandlerTest.php    |    2 +-
 .../Horde/Notification/Class/Notification/Listener/AudioTest.php  |    2 +-
 .../Horde/Notification/Class/Notification/Listener/StatusTest.php |    2 +-
 .../test/Horde/Notification/Class/Notification/ListenerTest.php   |    2 +-
 .../test/Horde/Notification/Class/NotificationTest.php            |    2 +-
 framework/Oauth/doc/Horde/Oauth/COPYING                           |    2 +-
 framework/Oauth/lib/Horde/Oauth/Consumer.php                      |    2 +-
 framework/Oauth/lib/Horde/Oauth/Exception.php                     |    2 +-
 framework/Oauth/lib/Horde/Oauth/Request.php                       |    2 +-
 framework/Oauth/lib/Horde/Oauth/SignatureMethod.php               |    2 +-
 framework/Oauth/lib/Horde/Oauth/SignatureMethod/HmacSha1.php      |    2 +-
 framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php     |    2 +-
 framework/Oauth/lib/Horde/Oauth/SignatureMethod/RsaSha1.php       |    2 +-
 framework/Oauth/lib/Horde/Oauth/Token.php                         |    2 +-
 framework/Oauth/lib/Horde/Oauth/Utils.php                         |    2 +-
 framework/Pdf/lib/Horde/Pdf/Writer.php                            |    2 +-
 framework/Pdf/package.xml                                         |   23 ++-
 framework/Pear/doc/Horde/Pear/COPYING                             |   50 +----
 framework/Pear/lib/Horde/Pear/Exception.php                       |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents.php                |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/Ignore.php         |    2 +-
 .../Pear/lib/Horde/Pear/Package/Contents/Ignore/Composite.php     |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/Ignore/Dot.php     |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/Ignore/Git.php     |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/Ignore/Hidden.php  |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/Ignore/Nothing.php |    2 +-
 .../Pear/lib/Horde/Pear/Package/Contents/Ignore/Patterns.php      |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/Ignore/Symlink.php |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/Include.php        |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/Include/All.php    |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/InstallAs.php      |    2 +-
 .../Pear/lib/Horde/Pear/Package/Contents/InstallAs/Horde.php      |    2 +-
 .../Horde/Pear/Package/Contents/InstallAs/HordeApplication.php    |    2 +-
 .../lib/Horde/Pear/Package/Contents/InstallAs/HordeComponent.php  |    2 +-
 .../Pear/lib/Horde/Pear/Package/Contents/InstallAs/HordeRole.php  |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/List.php           |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Contents/Role.php           |    2 +-
 .../lib/Horde/Pear/Package/Contents/Role/HordeApplication.php     |    2 +-
 .../Pear/lib/Horde/Pear/Package/Contents/Role/HordeComponent.php  |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Dependencies.php            |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Task.php                    |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Task/UpdateContents.php     |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Type.php                    |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Type/Horde.php              |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Xml.php                     |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Xml/Contents.php            |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Xml/Directory.php           |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Xml/Element/Directory.php   |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Xml/Element/File.php        |    2 +-
 framework/Pear/lib/Horde/Pear/Package/Xml/Factory.php             |    2 +-
 framework/Pear/lib/Horde/Pear/Registry.php                        |    2 +-
 framework/Pear/lib/Horde/Pear/Remote.php                          |    2 +-
 framework/Pear/lib/Horde/Pear/Rest.php                            |    2 +-
 framework/Pear/lib/Horde/Pear/Rest/Dependencies.php               |    2 +-
 framework/Pear/lib/Horde/Pear/Rest/Package.php                    |    2 +-
 framework/Pear/lib/Horde/Pear/Rest/PackageList.php                |    2 +-
 framework/Pear/lib/Horde/Pear/Rest/Release.php                    |    2 +-
 framework/Pear/lib/Horde/Pear/Rest/Releases.php                   |    2 +-
 framework/Pear/test/Horde/Pear/Server/RegistryTest.php            |    2 +-
 framework/Pear/test/Horde/Pear/Server/RemoteTest.php              |    2 +-
 framework/Pear/test/Horde/Pear/Server/RestTest.php                |    2 +-
 framework/Pear/test/Horde/Pear/TestCase.php                       |    2 +-
 .../Horde/Pear/Unit/Package/Contents/Ignore/CompositeTest.php     |    2 +-
 .../Pear/test/Horde/Pear/Unit/Package/Contents/Ignore/DotTest.php |    2 +-
 .../Pear/test/Horde/Pear/Unit/Package/Contents/Ignore/GitTest.php |    2 +-
 .../test/Horde/Pear/Unit/Package/Contents/Ignore/HiddenTest.php   |    2 +-
 .../test/Horde/Pear/Unit/Package/Contents/Ignore/PatternsTest.php |    2 +-
 .../test/Horde/Pear/Unit/Package/Contents/Ignore/SymlinkTest.php  |    2 +-
 .../Pear/Unit/Package/Contents/InstallAs/HordeApplicationTest.php |    2 +-
 .../test/Horde/Pear/Unit/Package/Contents/InstallAs/HordeTest.php |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Package/Contents/ListTest.php |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Package/DependenciesTest.php  |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Package/Type/HordeTest.php    |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Package/Xml/DirectoryTest.php |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Package/XmlTest.php           |    2 +-
 framework/Pear/test/Horde/Pear/Unit/RegistryTest.php              |    2 +-
 framework/Pear/test/Horde/Pear/Unit/RemoteTest.php                |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/AccessTest.php           |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/DependenciesTest.php     |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/PackageListTest.php      |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/PackageTest.php          |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/ReleaseTest.php          |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/ReleasesTest.php         |    2 +-
 framework/Pear/test/Horde/Pear/Unit/RestTest.php                  |    2 +-
 framework/Perms/lib/Horde/Perms.php                               |    2 +-
 framework/Perms/lib/Horde/Perms/Base.php                          |    2 +-
 framework/Perms/lib/Horde/Perms/Exception.php                     |    2 +-
 framework/Perms/lib/Horde/Perms/Null.php                          |    2 +-
 framework/Perms/lib/Horde/Perms/Permission.php                    |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab.php              |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl.php          |    2 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/Acl/Anonymous.php      |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl/Anyone.php   |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl/Group.php    |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl/User.php     |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/AclIterator.php  |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Element.php      |    2 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/Element/Default.php    |    2 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/Element/Group.php      |    2 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/Element/Guest.php      |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Element/User.php |    2 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/ElementIterator.php    |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Storage.php      |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Sql.php                |    2 +-
 framework/Perms/lib/Horde/Perms/Sql.php                           |    2 +-
 framework/Perms/lib/Horde/Perms/Translation.php                   |    2 +-
 framework/Perms/locale/ar/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/bg/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/bs/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/ca/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/cs/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/da/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/de/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/el/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/en/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/es/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/et/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/eu/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/fa/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/fi/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/fr/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/gl/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/he/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/hr/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/hu/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/id/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/is/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/it/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/ja/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/km/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/ko/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/lt/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/lv/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/mk/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/nb/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/nl/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/nn/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/pl/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/pt/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/pt_BR/LC_MESSAGES/Horde_Perms.po           |    2 +-
 framework/Perms/locale/ro/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/ru/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/sk/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/sl/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/sv/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/tr/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/uk/LC_MESSAGES/Horde_Perms.po              |    2 +-
 framework/Perms/locale/zh_CN/LC_MESSAGES/Horde_Perms.po           |    2 +-
 framework/Perms/locale/zh_TW/LC_MESSAGES/Horde_Perms.po           |    2 +-
 framework/Perms/package.xml                                       |   24 ++-
 framework/Perms/test/Horde/Perms/KolabTest.php                    |    2 +-
 framework/Prefs/bin/horde-prefs                                   |    2 +-
 framework/Prefs/lib/Horde/Prefs.php                               |    2 +-
 framework/Prefs/lib/Horde/Prefs/Cache/Base.php                    |    2 +-
 framework/Prefs/lib/Horde/Prefs/Cache/Null.php                    |    2 +-
 framework/Prefs/lib/Horde/Prefs/Cache/Session.php                 |    2 +-
 framework/Prefs/lib/Horde/Prefs/CategoryManager.php               |    2 +-
 framework/Prefs/lib/Horde/Prefs/Exception.php                     |    2 +-
 framework/Prefs/lib/Horde/Prefs/Identity.php                      |    2 +-
 framework/Prefs/lib/Horde/Prefs/Scope.php                         |    2 +-
 framework/Prefs/lib/Horde/Prefs/Storage/Base.php                  |    2 +-
 framework/Prefs/lib/Horde/Prefs/Storage/File.php                  |    2 +-
 framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php                  |    2 +-
 framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php             |    2 +-
 framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php                  |    2 +-
 framework/Prefs/lib/Horde/Prefs/Storage/Null.php                  |    2 +-
 framework/Prefs/lib/Horde/Prefs/Storage/Sql.php                   |    2 +-
 framework/Prefs/lib/Horde/Prefs/Translation.php                   |    2 +-
 framework/Prefs/locale/ar/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/bg/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/bs/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/ca/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/cs/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/da/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/de/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/el/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/en/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/es/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/et/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/eu/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/fa/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/fi/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/fr/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/gl/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/he/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/hr/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/hu/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/id/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/is/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/it/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/ja/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/km/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/ko/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/lt/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/lv/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/mk/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/nb/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/nl/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/nn/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/pl/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/pt/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/pt_BR/LC_MESSAGES/Horde_Prefs.po           |    2 +-
 framework/Prefs/locale/ro/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/ru/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/sk/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/sl/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/sv/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/tr/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/uk/LC_MESSAGES/Horde_Prefs.po              |    2 +-
 framework/Prefs/locale/zh_CN/LC_MESSAGES/Horde_Prefs.po           |    2 +-
 framework/Prefs/locale/zh_TW/LC_MESSAGES/Horde_Prefs.po           |    2 +-
 framework/Prefs/package.xml                                       |   27 ++-
 framework/Prefs/test/Horde/Prefs/Autoload.php                     |    2 +-
 framework/Prefs/test/Horde/Prefs/Stub/Storage.php                 |    2 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/FileTest.php        |    2 +-
 .../Prefs/test/Horde/Prefs/Unit/Storage/KolabImapLogTest.php      |    2 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/KolabImapTest.php   |    2 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php        |    2 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/MysqlTest.php   |    2 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/MysqliTest.php  |    2 +-
 .../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/MysqlTest.php     |    2 +-
 .../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/PgsqlTest.php     |    2 +-
 .../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/SqliteTest.php    |    2 +-
 framework/PubSub/doc/Horde/PubSub/COPYING                         |    2 +-
 framework/PubSub/lib/Horde/PubSub.php                             |    2 +-
 framework/PubSub/lib/Horde/PubSub/Handle.php                      |    2 +-
 framework/PubSub/lib/Horde/PubSub/Provider.php                    |    2 +-
 framework/Push/lib/Horde/Push.php                                 |    2 +-
 framework/Push/lib/Horde/Push/Cli.php                             |    2 +-
 framework/Push/lib/Horde/Push/Exception.php                       |    2 +-
 framework/Push/lib/Horde/Push/Factory/Push.php                    |    2 +-
 framework/Push/lib/Horde/Push/Factory/Recipients.php              |    2 +-
 framework/Push/lib/Horde/Push/Recipient.php                       |    2 +-
 framework/Push/lib/Horde/Push/Recipient/Base.php                  |    2 +-
 framework/Push/lib/Horde/Push/Recipient/Blogger.php               |    2 +-
 framework/Push/lib/Horde/Push/Recipient/Facebook.php              |    2 +-
 framework/Push/lib/Horde/Push/Recipient/Mail.php                  |    2 +-
 framework/Push/lib/Horde/Push/Recipient/Mock.php                  |    2 +-
 framework/Push/lib/Horde/Push/Recipient/Twitter.php               |    2 +-
 framework/Push/lib/Horde/Push/Translation.php                     |    2 +-
 framework/Push/locale/de/LC_MESSAGES/Horde_Push.po                |    2 +-
 framework/Push/locale/es/LC_MESSAGES/Horde_Push.po                |    2 +-
 framework/Push/locale/eu/LC_MESSAGES/Horde_Push.po                |    2 +-
 framework/Push/locale/fi/LC_MESSAGES/Horde_Push.po                |    2 +-
 framework/Push/locale/ja/LC_MESSAGES/Horde_Push.po                |    2 +-
 framework/Push/locale/lv/LC_MESSAGES/Horde_Push.po                |    2 +-
 framework/Push/test/Horde/Push/Autoload.php                       |    2 +-
 framework/Push/test/Horde/Push/TestCase.php                       |    2 +-
 framework/Push/test/Horde/Push/Unit/Push/CliTest.php              |    2 +-
 framework/Push/test/Horde/Push/Unit/Push/Factory/PushTest.php     |    2 +-
 .../Push/test/Horde/Push/Unit/Push/Factory/RecipientTest.php      |    2 +-
 .../Push/test/Horde/Push/Unit/Push/Recipient/BloggerTest.php      |    2 +-
 framework/Push/test/Horde/Push/Unit/Push/Recipient/MailTest.php   |    2 +-
 .../Push/test/Horde/Push/Unit/Push/Recipient/TwitterTest.php      |    2 +-
 framework/Push/test/Horde/Push/Unit/PushTest.php                  |    2 +-
 framework/Rampage/scripts/Horde/Rampage/rampage.php               |    2 +-
 framework/Rdo/lib/Horde/Rdo.php                                   |    2 +-
 framework/Rdo/test/Horde/Rdo/Autoload.php                         |    2 +-
 framework/Rdo/test/Horde/Rdo/Base.php                             |    2 +-
 framework/Rdo/test/Horde/Rdo/Sql/Base.php                         |    2 +-
 framework/Rdo/test/Horde/Rdo/Sql/Pdo/SqliteTest.php               |    2 +-
 framework/Rdo/test/Horde/Rdo/fixtures/unit_tests.sql              |    2 +-
 framework/Reflection/lib/Horde/Reflection.php                     |    2 +-
 framework/Reflection/lib/Horde/Reflection/Cli.php                 |    2 +-
 framework/Reflection/lib/Horde/Reflection/Html.php                |    2 +-
 framework/Reflection/lib/Horde/Reflection/Wiki.php                |    2 +-
 framework/Release/lib/Horde/Release.php                           |    4 +-
 framework/Release/lib/Horde/Release/Freecode.php                  |    2 +-
 framework/Release/lib/Horde/Release/MailingList.php               |    2 +-
 framework/Release/lib/Horde/Release/Sentinel.php                  |    2 +-
 framework/Release/lib/Horde/Release/Whups.php                     |    2 +-
 framework/Release/test/Horde/Release/TestCase.php                 |    2 +-
 .../Release/test/Horde/Release/Unit/Release/SentinelTest.php      |    2 +-
 framework/Release/test/Horde/Release/Unit/Release/WhupsTest.php   |    2 +-
 framework/Release/test/Horde/Release/Unit/ReleaseTest.php         |    2 +-
 framework/Role/Horde.php                                          |    2 +-
 framework/Role/Horde/Role.php                                     |    2 +-
 framework/Routes/doc/Horde/Routes/COPYING                         |    2 +-
 framework/Routes/lib/Horde/Routes/Matcher.php                     |    2 +-
 framework/Routes/package.xml                                      |   23 ++-
 framework/Rpc/lib/Horde/Rpc.php                                   |    2 +-
 framework/Rpc/lib/Horde/Rpc/ActiveSync.php                        |    2 +-
 framework/Rpc/lib/Horde/Rpc/Exception.php                         |    2 +-
 framework/Rpc/lib/Horde/Rpc/Jsonrpc.php                           |    2 +-
 framework/Rpc/lib/Horde/Rpc/Soap.php                              |    2 +-
 framework/Rpc/lib/Horde/Rpc/Syncml.php                            |    2 +-
 framework/Rpc/lib/Horde/Rpc/Syncml/Wbxml.php                      |    2 +-
 framework/Rpc/lib/Horde/Rpc/Translation.php                       |    2 +-
 framework/Rpc/lib/Horde/Rpc/Webdav.php                            |    4 +-
 framework/Rpc/lib/Horde/Rpc/Webdav2.php                           |    2 +-
 framework/Rpc/lib/Horde/Rpc/Xmlrpc.php                            |    2 +-
 framework/Rpc/locale/ar/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/bg/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/bs/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/ca/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/cs/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/da/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/de/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/el/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/en/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/es/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/et/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/eu/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/fa/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/fi/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/fr/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/gl/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/he/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/hr/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/hu/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/id/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/is/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/it/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/ja/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/km/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/ko/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/lt/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/lv/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/mk/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/nb/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/nl/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/nn/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/pl/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/pt/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/pt_BR/LC_MESSAGES/Horde_Rpc.po               |    2 +-
 framework/Rpc/locale/ro/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/ru/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/sk/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/sl/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/sv/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/tr/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/uk/LC_MESSAGES/Horde_Rpc.po                  |    2 +-
 framework/Rpc/locale/zh_CN/LC_MESSAGES/Horde_Rpc.po               |    2 +-
 framework/Rpc/locale/zh_TW/LC_MESSAGES/Horde_Rpc.po               |    2 +-
 framework/Sabre/lib/Sabre/CalDAV/Backend/Horde.php                |    2 +-
 framework/Sabre/lib/Sabre/DAV/Auth/Backend/Horde.php              |    2 +-
 framework/Scribe/doc/Horde/Scribe/COPYING                         |    2 +-
 framework/Secret/lib/Horde/Secret.php                             |    2 +-
 framework/Secret/lib/Horde/Secret/Exception.php                   |    2 +-
 framework/Secret/test/Horde/Secret/Unit/SecretTest.php            |    2 +-
 framework/Serialize/lib/Horde/Serialize.php                       |    2 +-
 framework/Serialize/lib/Horde/Serialize/Exception.php             |    2 +-
 framework/Service_Facebook/doc/Horde/Service/Facebook/COPYING     |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook.php         |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Auth.php    |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Base.php    |    2 +-
 .../Service_Facebook/lib/Horde/Service/Facebook/ErrorCodes.php    |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Events.php  |    2 +-
 .../Service_Facebook/lib/Horde/Service/Facebook/Exception.php     |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Fql.php     |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Friends.php |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Groups.php  |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Links.php   |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Notes.php   |    2 +-
 .../Service_Facebook/lib/Horde/Service/Facebook/Notifications.php |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Photos.php  |    2 +-
 .../Service_Facebook/lib/Horde/Service/Facebook/Request/Base.php  |    2 +-
 .../Service_Facebook/lib/Horde/Service/Facebook/Request/Graph.php |    2 +-
 .../Service_Facebook/lib/Horde/Service/Facebook/Request/Rest.php  |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Streams.php |    2 +-
 .../Service_Facebook/lib/Horde/Service/Facebook/Translation.php   |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Users.php   |    2 +-
 framework/Service_Facebook/lib/Horde/Service/Facebook/Videos.php  |    2 +-
 .../locale/ar/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/bg/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/bs/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/ca/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/cs/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/da/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/de/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/el/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/en/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/es/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/et/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/eu/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/fa/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/fi/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/fr/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/gl/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/he/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/hr/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/hu/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/id/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/is/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/it/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/ja/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/km/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/ko/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/lt/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/lv/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/mk/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/nb/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/nl/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/nn/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/pl/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/pt/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/pt_BR/LC_MESSAGES/Horde_Service_Facebook.po            |    2 +-
 .../locale/ro/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/ru/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/sk/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/sl/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/sv/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/tr/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/uk/LC_MESSAGES/Horde_Service_Facebook.po               |    2 +-
 .../locale/zh_CN/LC_MESSAGES/Horde_Service_Facebook.po            |    2 +-
 .../locale/zh_TW/LC_MESSAGES/Horde_Service_Facebook.po            |    2 +-
 framework/Service_Facebook/package.xml                            |   23 ++-
 framework/Service_Gravatar/lib/Horde/Service/Gravatar.php         |    2 +-
 .../Service_Gravatar/test/Horde/Service/Gravatar/GravatarTest.php |    2 +-
 .../Service_Gravatar/test/Horde/Service/Gravatar/ServerTest.php   |    2 +-
 framework/Service_Scribd/doc/Horde/Service/Scribd/COPYING         |    2 +-
 framework/Service_Scribd/lib/Horde/Service/Scribd.php             |    2 +-
 framework/Service_Scribd/lib/Horde/Service/Scribd/Exception.php   |    2 +-
 framework/Service_Scribd/lib/Horde/Service/Scribd/Request.php     |    2 +-
 framework/Service_Scribd/lib/Horde/Service/Scribd/Response.php    |    2 +-
 framework/Service_Scribd/lib/Horde/Service/Scribd/Result.php      |    2 +-
 framework/Service_Scribd/lib/Horde/Service/Scribd/ResultSet.php   |    2 +-
 framework/Service_Scribd/lib/Horde/Service/Scribd/Translation.php |    2 +-
 .../Service_Scribd/locale/ar/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/bg/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/bs/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/ca/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/cs/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/da/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/de/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/el/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/en/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/es/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/et/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/eu/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/fa/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/fi/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/fr/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/gl/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/he/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/hr/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/hu/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/id/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/is/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/it/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/ja/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/km/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/ko/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/lt/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/lv/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/mk/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/nb/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/nl/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/nn/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/pl/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/pt/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../locale/pt_BR/LC_MESSAGES/Horde_Service_Scribd.po              |    2 +-
 .../Service_Scribd/locale/ro/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/ru/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/sk/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/sl/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/sv/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/tr/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../Service_Scribd/locale/uk/LC_MESSAGES/Horde_Service_Scribd.po  |    2 +-
 .../locale/zh_CN/LC_MESSAGES/Horde_Service_Scribd.po              |    2 +-
 .../locale/zh_TW/LC_MESSAGES/Horde_Service_Scribd.po              |    2 +-
 framework/Service_Twitter/doc/Horde/Service/Twitter/COPYING       |    2 +-
 .../Service_Twitter/doc/Horde/Service/Twitter/twitter_browser.php |    2 +-
 .../Service_Twitter/doc/Horde/Service/Twitter/twitter_cli.php     |    2 +-
 framework/Service_Twitter/lib/Horde/Service/Twitter.php           |    2 +-
 framework/Service_Twitter/lib/Horde/Service/Twitter/Account.php   |    2 +-
 framework/Service_Twitter/lib/Horde/Service/Twitter/Auth.php      |    2 +-
 .../Service_Twitter/lib/Horde/Service/Twitter/Auth/Oauth.php      |    2 +-
 framework/Service_Twitter/lib/Horde/Service/Twitter/Exception.php |    2 +-
 framework/Service_Twitter/lib/Horde/Service/Twitter/Request.php   |    2 +-
 .../Service_Twitter/lib/Horde/Service/Twitter/Request/Oauth.php   |    2 +-
 framework/Service_Twitter/lib/Horde/Service/Twitter/Statuses.php  |    2 +-
 .../Service_UrlShortener/lib/Horde/Service/UrlShortener/Base.php  |    2 +-
 .../lib/Horde/Service/UrlShortener/Exception.php                  |    2 +-
 .../lib/Horde/Service/UrlShortener/TinyUrl.php                    |    2 +-
 framework/Service_Vimeo/doc/Horde/Service/Vimeo/COPYING           |    2 +-
 framework/Service_Vimeo/lib/Horde/Service/Vimeo.php               |    2 +-
 framework/Service_Vimeo/lib/Horde/Service/Vimeo/Advanced.php      |    2 +-
 framework/Service_Vimeo/lib/Horde/Service/Vimeo/Exception.php     |    2 +-
 framework/Service_Vimeo/lib/Horde/Service/Vimeo/Simple.php        |    2 +-
 framework/Service_Weather/doc/Horde/Service/Weather/COPYING       |    4 +-
 framework/Service_Weather/lib/Horde/Service/Weather.php           |    2 +-
 framework/Service_Weather/lib/Horde/Service/Weather/Base.php      |    2 +-
 .../Service_Weather/lib/Horde/Service/Weather/Current/Base.php    |    2 +-
 .../lib/Horde/Service/Weather/Current/WeatherUnderground.php      |    2 +-
 .../Service_Weather/lib/Horde/Service/Weather/Current/Wwo.php     |    2 +-
 framework/Service_Weather/lib/Horde/Service/Weather/Exception.php |    2 +-
 .../lib/Horde/Service/Weather/Exception/InvalidProperty.php       |    2 +-
 .../Service_Weather/lib/Horde/Service/Weather/Forecast/Base.php   |    2 +-
 .../lib/Horde/Service/Weather/Forecast/WeatherUnderground.php     |    2 +-
 .../Service_Weather/lib/Horde/Service/Weather/Forecast/Wwo.php    |    2 +-
 .../Service_Weather/lib/Horde/Service/Weather/Period/Base.php     |    2 +-
 .../lib/Horde/Service/Weather/Period/WeatherUnderground.php       |    2 +-
 .../Service_Weather/lib/Horde/Service/Weather/Period/Wwo.php      |    2 +-
 framework/Service_Weather/lib/Horde/Service/Weather/Station.php   |    2 +-
 .../Service_Weather/lib/Horde/Service/Weather/Translation.php     |    2 +-
 .../lib/Horde/Service/Weather/WeatherUnderground.php              |    2 +-
 framework/Service_Weather/lib/Horde/Service/Weather/Wwo.php       |    2 +-
 .../locale/de/LC_MESSAGES/Horde_Service_Weather.po                |    2 +-
 .../locale/en_US/LC_MESSAGES/Horde_Service_Weather.po             |    2 +-
 .../locale/es/LC_MESSAGES/Horde_Service_Weather.po                |    2 +-
 .../locale/eu/LC_MESSAGES/Horde_Service_Weather.po                |    2 +-
 .../locale/fi/LC_MESSAGES/Horde_Service_Weather.po                |    2 +-
 .../locale/ja/LC_MESSAGES/Horde_Service_Weather.po                |    2 +-
 .../locale/lv/LC_MESSAGES/Horde_Service_Weather.po                |    2 +-
 .../locale/nl/LC_MESSAGES/Horde_Service_Weather.po                |    2 +-
 framework/Service_Weather/package.xml                             |   31 +++-
 framework/SessionHandler/lib/Horde/SessionHandler.php             |    2 +-
 framework/SessionHandler/lib/Horde/SessionHandler/Exception.php   |    2 +-
 framework/SessionHandler/lib/Horde/SessionHandler/Storage.php     |    2 +-
 .../SessionHandler/lib/Horde/SessionHandler/Storage/Builtin.php   |    2 +-
 .../SessionHandler/lib/Horde/SessionHandler/Storage/External.php  |    2 +-
 .../SessionHandler/lib/Horde/SessionHandler/Storage/File.php      |    6 +-
 .../SessionHandler/lib/Horde/SessionHandler/Storage/Memcache.php  |    2 +-
 framework/SessionHandler/lib/Horde/SessionHandler/Storage/Sql.php |    2 +-
 .../SessionHandler/lib/Horde/SessionHandler/Storage/Stack.php     |    2 +-
 .../test/Horde/SessionHandler/Storage/BuiltinTest.php             |    2 +-
 .../test/Horde/SessionHandler/Storage/ExternalTest.php            |    2 +-
 .../SessionHandler/test/Horde/SessionHandler/Storage/FileTest.php |    2 +-
 .../test/Horde/SessionHandler/Storage/MemcacheTest.php            |    2 +-
 .../SessionHandler/test/Horde/SessionHandler/Storage/Sql/Base.php |    2 +-
 .../test/Horde/SessionHandler/Storage/Sql/MysqlTest.php           |    2 +-
 .../test/Horde/SessionHandler/Storage/Sql/MysqliTest.php          |    2 +-
 .../test/Horde/SessionHandler/Storage/Sql/Pdo/MysqlTest.php       |    2 +-
 .../test/Horde/SessionHandler/Storage/Sql/Pdo/PgsqlTest.php       |    2 +-
 .../test/Horde/SessionHandler/Storage/Sql/Pdo/SqliteTest.php      |    2 +-
 .../test/Horde/SessionHandler/Storage/StackTest.php               |    2 +-
 framework/Share/lib/Horde/Share/Base.php                          |    2 +-
 framework/Share/lib/Horde/Share/Kolab.php                         |    2 +-
 framework/Share/lib/Horde/Share/Object/Kolab.php                  |    2 +-
 framework/Share/lib/Horde/Share/Sql.php                           |    2 +-
 framework/Share/lib/Horde/Share/Sqlng.php                         |    2 +-
 framework/Share/lib/Horde/Share/Translation.php                   |    2 +-
 framework/Share/locale/ar/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/bg/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/bs/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/ca/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/cs/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/da/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/de/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/el/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/en/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/es/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/et/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/eu/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/fa/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/fi/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/fr/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/gl/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/he/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/hr/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/hu/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/id/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/is/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/it/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/ja/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/km/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/ko/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/lt/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/lv/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/mk/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/nb/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/nl/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/nn/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/pl/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/pt/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/pt_BR/LC_MESSAGES/Horde_Share.po           |    2 +-
 framework/Share/locale/ro/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/ru/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/sk/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/sl/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/sv/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/tr/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/uk/LC_MESSAGES/Horde_Share.po              |    2 +-
 framework/Share/locale/zh_CN/LC_MESSAGES/Horde_Share.po           |    2 +-
 framework/Share/locale/zh_TW/LC_MESSAGES/Horde_Share.po           |    2 +-
 framework/Share/test/Horde/Share/Autoload.php                     |    2 +-
 framework/Share/test/Horde/Share/Base.php                         |    2 +-
 framework/Share/test/Horde/Share/Kolab/MockTest.php               |    2 +-
 framework/Share/test/Horde/Share/Kolab/UnitTest.php               |    2 +-
 framework/Share/test/Horde/Share/Sql/Base.php                     |    2 +-
 framework/Share/test/Horde/Share/Sql/MysqlTest.php                |    2 +-
 framework/Share/test/Horde/Share/Sql/MysqliTest.php               |    2 +-
 framework/Share/test/Horde/Share/Sql/Pdo/MysqlTest.php            |    2 +-
 framework/Share/test/Horde/Share/Sql/Pdo/PgsqlTest.php            |    2 +-
 framework/Share/test/Horde/Share/Sql/Pdo/SqliteTest.php           |    2 +-
 framework/Share/test/Horde/Share/Sqlng/Base.php                   |    2 +-
 framework/Share/test/Horde/Share/Sqlng/MysqlTest.php              |    2 +-
 framework/Share/test/Horde/Share/Sqlng/MysqliTest.php             |    2 +-
 framework/Share/test/Horde/Share/Sqlng/Pdo/MysqlTest.php          |    2 +-
 framework/Share/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php          |    2 +-
 framework/Share/test/Horde/Share/Sqlng/Pdo/SqliteTest.php         |    2 +-
 framework/SpellChecker/lib/Horde/SpellChecker.php                 |    6 +-
 framework/SpellChecker/lib/Horde/SpellChecker/Aspell.php          |    6 +-
 framework/SpellChecker/lib/Horde/SpellChecker/Exception.php       |    6 +-
 framework/SpellChecker/test/Horde/SpellChecker/AspellTest.php     |    2 +-
 framework/Stream/lib/Horde/Stream.php                             |    2 +-
 framework/Stream/lib/Horde/Stream/Exception.php                   |    2 +-
 framework/Stream/lib/Horde/Stream/Existing.php                    |    2 +-
 framework/Stream/lib/Horde/Stream/Temp.php                        |    2 +-
 framework/Stream_Filter/lib/Horde/Stream/Filter/Bin2hex.php       |    2 +-
 framework/Stream_Filter/lib/Horde/Stream/Filter/Crc32.php         |    2 +-
 framework/Stream_Filter/lib/Horde/Stream/Filter/Eol.php           |    2 +-
 .../Stream_Filter/lib/Horde/Stream/Filter/Htmlspecialchars.php    |    2 +-
 framework/Stream_Filter/lib/Horde/Stream/Filter/Null.php          |    2 +-
 framework/Stream_Wrapper/lib/Horde/Stream/Wrapper/Combine.php     |    2 +-
 .../Stream_Wrapper/lib/Horde/Stream/Wrapper/CombineStream.php     |    2 +-
 framework/Stream_Wrapper/lib/Horde/Stream/Wrapper/String.php      |    2 +-
 .../Stream_Wrapper/lib/Horde/Stream/Wrapper/StringStream.php      |    2 +-
 framework/Support/doc/Horde/Support/COPYING                       |    2 +-
 framework/Support/lib/Horde/Support/Array.php                     |    2 +-
 framework/Support/lib/Horde/Support/Backtrace.php                 |    2 +-
 framework/Support/lib/Horde/Support/CombineStream.php             |    2 +-
 framework/Support/lib/Horde/Support/ConsistentHash.php            |    2 +-
 framework/Support/lib/Horde/Support/Guid.php                      |    2 +-
 framework/Support/lib/Horde/Support/Inflector.php                 |    2 +-
 framework/Support/lib/Horde/Support/Memory.php                    |    2 +-
 framework/Support/lib/Horde/Support/Numerizer.php                 |    2 +-
 framework/Support/lib/Horde/Support/Numerizer/Locale/Base.php     |    2 +-
 framework/Support/lib/Horde/Support/Numerizer/Locale/De.php       |    2 +-
 framework/Support/lib/Horde/Support/Numerizer/Locale/Pt.php       |    2 +-
 framework/Support/lib/Horde/Support/ObjectStub.php                |    2 +-
 framework/Support/lib/Horde/Support/Randomid.php                  |    2 +-
 framework/Support/lib/Horde/Support/Stack.php                     |    2 +-
 framework/Support/lib/Horde/Support/StringStream.php              |    2 +-
 framework/Support/lib/Horde/Support/Stub.php                      |    2 +-
 framework/Support/lib/Horde/Support/Timer.php                     |    2 +-
 framework/Support/lib/Horde/Support/Uuid.php                      |    2 +-
 framework/Support/test/Horde/Support/ArrayTest.php                |    2 +-
 framework/Support/test/Horde/Support/BacktraceTest.php            |    2 +-
 framework/Support/test/Horde/Support/CombineStreamTest.php        |    2 +-
 framework/Support/test/Horde/Support/ConsistentHashTest.php       |    2 +-
 framework/Support/test/Horde/Support/GuidTest.php                 |    2 +-
 framework/Support/test/Horde/Support/InflectorTest.php            |    2 +-
 framework/Support/test/Horde/Support/MemoryTest.php               |    2 +-
 framework/Support/test/Horde/Support/ObjectStubTest.php           |    2 +-
 framework/Support/test/Horde/Support/RandomidTest.php             |    2 +-
 framework/Support/test/Horde/Support/StackTest.php                |    2 +-
 framework/Support/test/Horde/Support/StringStreamTest.php         |    2 +-
 framework/Support/test/Horde/Support/StubTest.php                 |    2 +-
 framework/Support/test/Horde/Support/TimerTest.php                |    2 +-
 framework/Support/test/Horde/Support/UuidTest.php                 |    2 +-
 framework/SyncMl/lib/Horde/SyncMl.php                             |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Backend.php                     |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Backend/Horde.php               |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Backend/Sql.php                 |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command.php                     |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command/Alert.php               |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command/Final.php               |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command/Get.php                 |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command/Map.php                 |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command/Put.php                 |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command/Replace.php             |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command/Results.php             |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command/Status.php              |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command/Sync.php                |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Command/SyncHdr.php             |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/ContentHandler.php              |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/DataStore.php                   |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Device.php                      |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Device/Nokia.php                |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Device/P800.php                 |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Device/Sync4JMozilla.php        |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Device/Sync4j.php               |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Device/Synthesis.php            |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/DeviceInfo.php                  |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Property.php                    |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/PropertyParameter.php           |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/State.php                       |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Sync.php                        |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/SyncElement.php                 |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/Translation.php                 |    2 +-
 framework/SyncMl/lib/Horde/SyncMl/XmlOutput.php                   |    2 +-
 framework/SyncMl/locale/ar/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/bg/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/bs/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/ca/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/cs/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/da/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/de/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/el/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/en/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/es/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/et/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/eu/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/fa/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/fi/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/fr/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/gl/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/he/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/hr/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/hu/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/id/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/is/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/it/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/ja/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/km/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/ko/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/lt/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/lv/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/mk/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/nb/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/nl/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/nn/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/pl/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/pt/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/pt_BR/LC_MESSAGES/Horde_SyncMl.po         |    2 +-
 framework/SyncMl/locale/ro/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/ru/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/sk/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/sl/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/sv/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/tr/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/uk/LC_MESSAGES/Horde_SyncMl.po            |    2 +-
 framework/SyncMl/locale/zh_CN/LC_MESSAGES/Horde_SyncMl.po         |    2 +-
 framework/SyncMl/locale/zh_TW/LC_MESSAGES/Horde_SyncMl.po         |    2 +-
 framework/SyncMl/test/Horde/SyncMl/testpacket.php                 |    2 +-
 framework/SyncMl/test/Horde/SyncMl/testsync.php                   |    2 +-
 framework/Template/lib/Horde/Template.php                         |    2 +-
 framework/Test/lib/Horde/Test/AllTests.php                        |    2 +-
 framework/Test/lib/Horde/Test/Autoload.php                        |    2 +-
 framework/Test/lib/Horde/Test/Bootstrap.php                       |    2 +-
 framework/Test/lib/Horde/Test/Case.php                            |    2 +-
 framework/Test/lib/Horde/Test/Exception.php                       |    2 +-
 framework/Test/lib/Horde/Test/Factory/Alarm.php                   |    2 +-
 framework/Test/lib/Horde/Test/Factory/Cache.php                   |    2 +-
 framework/Test/lib/Horde/Test/Factory/Db.php                      |    2 +-
 framework/Test/lib/Horde/Test/Factory/Group.php                   |    2 +-
 framework/Test/lib/Horde/Test/Factory/History.php                 |    2 +-
 framework/Test/lib/Horde/Test/Factory/KolabStorage.php            |    2 +-
 framework/Test/lib/Horde/Test/Factory/Perms.php                   |    2 +-
 framework/Test/lib/Horde/Test/Factory/Prefs.php                   |    2 +-
 framework/Test/lib/Horde/Test/Factory/Registry.php                |    2 +-
 framework/Test/lib/Horde/Test/Factory/Session.php                 |    2 +-
 framework/Test/lib/Horde/Test/Factory/Share.php                   |    2 +-
 framework/Test/lib/Horde/Test/Functional.php                      |    2 +-
 framework/Test/lib/Horde/Test/Log.php                             |    2 +-
 framework/Test/lib/Horde/Test/Setup.php                           |    2 +-
 framework/Test/lib/Horde/Test/Stub/Cli.php                        |    2 +-
 framework/Test/lib/Horde/Test/Stub/Factory.php                    |    2 +-
 framework/Test/lib/Horde/Test/Stub/Parser.php                     |    2 +-
 framework/Test/lib/Horde/Test/Stub/Registry.php                   |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff.php                       |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Engine/Native.php         |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Engine/Shell.php          |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Engine/String.php         |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Engine/Xdiff.php          |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Exception.php             |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Mapped.php                |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Op/Add.php                |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Op/Base.php               |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Op/Change.php             |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Op/Copy.php               |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Op/Delete.php             |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Renderer.php              |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Renderer/Context.php      |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Renderer/Inline.php       |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/Renderer/Unified.php      |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/ThreeWay.php              |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/ThreeWay/BlockBuilder.php |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/ThreeWay/Op/Base.php      |    2 +-
 framework/Text_Diff/lib/Horde/Text/Diff/ThreeWay/Op/Copy.php      |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter.php                   |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Base.php              |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Bbcode.php            |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Cleanascii.php        |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Cleanhtml.php         |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Dimsignature.php      |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Emails.php            |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Emoticons.php         |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Environment.php       |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Exception.php         |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Highlightquotes.php   |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Html2text.php         |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/JavascriptMinify.php  |    2 +-
 .../Text_Filter/lib/Horde/Text/Filter/JavascriptMinify/JsMin.php  |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Linkurls.php          |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Simplemarkup.php      |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Space2html.php        |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Tabs2spaces.php       |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Text2html.php         |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Translation.php       |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Words.php             |    2 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Xss.php               |    2 +-
 framework/Text_Filter/locale/ar/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/bg/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/bs/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/ca/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/cs/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/da/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/de/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/el/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/en/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/es/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/et/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/eu/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/fa/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/fi/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/fr/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/gl/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/he/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/hr/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/hu/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/id/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/is/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/it/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/ja/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/km/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/ko/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/lt/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/lv/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/mk/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/nb/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/nl/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/nn/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/pl/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/pt/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 .../Text_Filter/locale/pt_BR/LC_MESSAGES/Horde_Text_Filter.po     |    2 +-
 framework/Text_Filter/locale/ro/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/ru/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/sk/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/sl/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/sv/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/tr/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 framework/Text_Filter/locale/uk/LC_MESSAGES/Horde_Text_Filter.po  |    2 +-
 .../Text_Filter/locale/zh_CN/LC_MESSAGES/Horde_Text_Filter.po     |    2 +-
 .../Text_Filter/locale/zh_TW/LC_MESSAGES/Horde_Text_Filter.po     |    2 +-
 framework/Text_Filter_Csstidy/lib/Horde/Text/Filter/Csstidy.php   |    2 +-
 framework/Text_Flowed/lib/Horde/Text/Flowed.php                   |    2 +-
 framework/Thrift/doc/Horde/Thrift/COPYING                         |    2 +-
 framework/Timezone/lib/Horde/Timezone.php                         |    2 +-
 framework/Timezone/lib/Horde/Timezone/Exception.php               |    2 +-
 framework/Timezone/lib/Horde/Timezone/Rule.php                    |    2 +-
 framework/Timezone/lib/Horde/Timezone/Zone.php                    |    2 +-
 framework/Token/lib/Horde/Token.php                               |    2 +-
 framework/Token/lib/Horde/Token/Base.php                          |    2 +-
 framework/Token/lib/Horde/Token/Exception.php                     |    2 +-
 framework/Token/lib/Horde/Token/Exception/Expired.php             |    2 +-
 framework/Token/lib/Horde/Token/Exception/Invalid.php             |    2 +-
 framework/Token/lib/Horde/Token/Exception/Used.php                |    2 +-
 framework/Token/lib/Horde/Token/File.php                          |    2 +-
 framework/Token/lib/Horde/Token/Null.php                          |    2 +-
 framework/Token/lib/Horde/Token/Sql.php                           |    2 +-
 framework/Token/lib/Horde/Token/Translation.php                   |    2 +-
 framework/Token/locale/ar/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/bg/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/bs/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/ca/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/cs/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/da/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/de/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/el/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/en/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/es/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/et/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/eu/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/fa/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/fi/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/fr/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/gl/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/he/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/hr/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/hu/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/id/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/is/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/it/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/ja/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/km/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/ko/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/lt/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/lv/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/mk/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/nb/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/nl/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/nn/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/pl/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/pt/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/pt_BR/LC_MESSAGES/Horde_Token.po           |    2 +-
 framework/Token/locale/ro/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/ru/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/sk/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/sl/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/sv/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/tr/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/uk/LC_MESSAGES/Horde_Token.po              |    2 +-
 framework/Token/locale/zh_CN/LC_MESSAGES/Horde_Token.po           |    2 +-
 framework/Token/locale/zh_TW/LC_MESSAGES/Horde_Token.po           |    2 +-
 framework/Token/test/Horde/Token/Autoload.php                     |    2 +-
 framework/Token/test/Horde/Token/BackendTestCase.php              |    2 +-
 framework/Token/test/Horde/Token/Unit/FileTest.php                |    2 +-
 framework/Token/test/Horde/Token/Unit/SqlTest.php                 |    2 +-
 framework/Translation/lib/Horde/Translation.php                   |    2 +-
 framework/Translation/lib/Horde/Translation/Exception.php         |    2 +-
 framework/Translation/lib/Horde/Translation/Handler.php           |    2 +-
 framework/Translation/lib/Horde/Translation/Handler/Gettext.php   |    2 +-
 .../test/Horde/Translation/locale/de/LC_MESSAGES/Horde_Other.po   |    2 +-
 .../Horde/Translation/locale/de/LC_MESSAGES/Horde_Translation.po  |    2 +-
 framework/Tree/lib/Horde/Tree.php                                 |    2 +-
 framework/Tree/lib/Horde/Tree/Exception.php                       |    2 +-
 framework/Tree/lib/Horde/Tree/Renderer.php                        |    2 +-
 framework/Tree/lib/Horde/Tree/Renderer/Base.php                   |    2 +-
 framework/Tree/lib/Horde/Tree/Renderer/Html.php                   |    2 +-
 framework/Tree/lib/Horde/Tree/Renderer/Jquerymobile.php           |    2 +-
 framework/Tree/lib/Horde/Tree/Renderer/Select.php                 |    2 +-
 framework/Tree/lib/Horde/Tree/Renderer/Simplehtml.php             |    2 +-
 framework/Url/lib/Horde/Url.php                                   |    2 +-
 framework/Url/lib/Horde/Url/Exception.php                         |    2 +-
 framework/Util/lib/Horde/Array.php                                |    2 +-
 framework/Util/lib/Horde/Array/Sort/Helper.php                    |    2 +-
 framework/Util/lib/Horde/Domhtml.php                              |    2 +-
 framework/Util/lib/Horde/String.php                               |    2 +-
 framework/Util/lib/Horde/Util.php                                 |    2 +-
 framework/Util/lib/Horde/Variables.php                            |    2 +-
 framework/Util/package.xml                                        |   21 ++-
 framework/Vcs/lib/Horde/Vcs.php                                   |    2 +-
 framework/Vcs/lib/Horde/Vcs/Base.php                              |    2 +-
 framework/Vcs/lib/Horde/Vcs/Cvs.php                               |    2 +-
 framework/Vcs/lib/Horde/Vcs/Directory/Base.php                    |    2 +-
 framework/Vcs/lib/Horde/Vcs/Directory/Cvs.php                     |    2 +-
 framework/Vcs/lib/Horde/Vcs/Directory/Git.php                     |    2 +-
 framework/Vcs/lib/Horde/Vcs/Directory/Rcs.php                     |    2 +-
 framework/Vcs/lib/Horde/Vcs/File/Base.php                         |    2 +-
 framework/Vcs/lib/Horde/Vcs/File/Cvs.php                          |    2 +-
 framework/Vcs/lib/Horde/Vcs/File/Git.php                          |    2 +-
 framework/Vcs/lib/Horde/Vcs/File/Rcs.php                          |    2 +-
 framework/Vcs/lib/Horde/Vcs/Git.php                               |    2 +-
 framework/Vcs/lib/Horde/Vcs/Log/Base.php                          |    2 +-
 framework/Vcs/lib/Horde/Vcs/Log/Cvs.php                           |    2 +-
 framework/Vcs/lib/Horde/Vcs/Log/Git.php                           |    2 +-
 framework/Vcs/lib/Horde/Vcs/Log/Rcs.php                           |    2 +-
 framework/Vcs/lib/Horde/Vcs/Patchset/Cvs.php                      |    2 +-
 framework/Vcs/lib/Horde/Vcs/Patchset/Git.php                      |    2 +-
 framework/Vcs/lib/Horde/Vcs/QuickLog/Base.php                     |    2 +-
 framework/Vcs/lib/Horde/Vcs/QuickLog/Cvs.php                      |    2 +-
 framework/Vcs/lib/Horde/Vcs/QuickLog/Git.php                      |    2 +-
 framework/Vcs/lib/Horde/Vcs/QuickLog/Rcs.php                      |    2 +-
 framework/Vcs/lib/Horde/Vcs/QuickLog/Svn.php                      |    2 +-
 framework/Vcs/lib/Horde/Vcs/Svn.php                               |    2 +-
 framework/Vfs/lib/Horde/Vfs.php                                   |    2 +-
 framework/Vfs/lib/Horde/Vfs/Base.php                              |    2 +-
 framework/Vfs/lib/Horde/Vfs/Exception.php                         |    2 +-
 framework/Vfs/lib/Horde/Vfs/File.php                              |    2 +-
 framework/Vfs/lib/Horde/Vfs/Ftp.php                               |    2 +-
 framework/Vfs/lib/Horde/Vfs/Gc.php                                |    2 +-
 framework/Vfs/lib/Horde/Vfs/Horde.php                             |    2 +-
 framework/Vfs/lib/Horde/Vfs/Kolab.php                             |    2 +-
 framework/Vfs/lib/Horde/Vfs/Musql.php                             |    2 +-
 framework/Vfs/lib/Horde/Vfs/Sql.php                               |    2 +-
 framework/Vfs/lib/Horde/Vfs/Ssh2.php                              |    2 +-
 framework/Vfs/lib/Horde/Vfs/Translation.php                       |    2 +-
 framework/Vfs/locale/ar/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/bg/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/bs/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/ca/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/cs/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/da/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/de/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/el/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/en/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/es/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/et/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/eu/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/fa/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/fi/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/fr/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/gl/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/he/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/hr/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/hu/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/id/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/is/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/it/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/ja/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/km/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/ko/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/lt/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/lv/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/mk/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/nb/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/nl/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/nn/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/pl/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/pt/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/pt_BR/LC_MESSAGES/Horde_Vfs.po               |    2 +-
 framework/Vfs/locale/ro/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/ru/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/sk/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/sl/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/sv/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/tr/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/uk/LC_MESSAGES/Horde_Vfs.po                  |    2 +-
 framework/Vfs/locale/zh_CN/LC_MESSAGES/Horde_Vfs.po               |    2 +-
 framework/Vfs/locale/zh_TW/LC_MESSAGES/Horde_Vfs.po               |    2 +-
 framework/Vfs/test/Horde/Vfs/Base.php                             |    2 +-
 framework/Vfs/test/Horde/Vfs/FileTest.php                         |    2 +-
 framework/Vfs/test/Horde/Vfs/FtpTest.php                          |    2 +-
 framework/Vfs/test/Horde/Vfs/KolabTest.php                        |    2 +-
 framework/Vfs/test/Horde/Vfs/SmbTest.php                          |    2 +-
 framework/Vfs/test/Horde/Vfs/Sql/Base.php                         |    2 +-
 framework/Vfs/test/Horde/Vfs/Sql/MysqlTest.php                    |    2 +-
 framework/Vfs/test/Horde/Vfs/Sql/MysqliTest.php                   |    2 +-
 framework/Vfs/test/Horde/Vfs/Sql/Pdo/MysqlTest.php                |    2 +-
 framework/Vfs/test/Horde/Vfs/Sql/Pdo/PgsqlTest.php                |    2 +-
 framework/Vfs/test/Horde/Vfs/Sql/Pdo/SqliteTest.php               |    2 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/Base.php                     |    2 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/MysqlTest.php                |    2 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/MysqliTest.php               |    2 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/Pdo/MysqlTest.php            |    2 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/Pdo/PgsqlTest.php            |    2 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/Pdo/SqliteTest.php           |    2 +-
 framework/Vfs/test/Horde/Vfs/Ssh2Test.php                         |    2 +-
 framework/View/lib/Horde/View/Helper/Benchmark.php                |    2 +-
 framework/View/lib/Horde/View/Helper/Benchmark/Timer.php          |    2 +-
 framework/View/lib/Horde/View/Helper/Block.php                    |    2 +-
 framework/View/lib/Horde/View/Helper/Capture.php                  |    2 +-
 framework/View/lib/Horde/View/Helper/Capture/Base.php             |    2 +-
 framework/View/lib/Horde/View/Helper/Capture/ContentFor.php       |    2 +-
 framework/View/lib/Horde/View/Helper/Date.php                     |    2 +-
 framework/View/lib/Horde/View/Helper/Debug.php                    |    2 +-
 framework/View/lib/Horde/View/Helper/Form.php                     |    2 +-
 framework/View/lib/Horde/View/Helper/Form/Builder.php             |    2 +-
 framework/View/lib/Horde/View/Helper/Form/InstanceTag/Base.php    |    2 +-
 framework/View/lib/Horde/View/Helper/Form/InstanceTag/Form.php    |    2 +-
 framework/View/lib/Horde/View/Helper/FormTag.php                  |    2 +-
 framework/View/lib/Horde/View/Helper/Javascript.php               |    2 +-
 framework/View/lib/Horde/View/Helper/Number.php                   |    2 +-
 framework/View/lib/Horde/View/Helper/Tag.php                      |    2 +-
 framework/View/lib/Horde/View/Helper/Text.php                     |    2 +-
 framework/View/lib/Horde/View/Helper/Text/Cycle.php               |    2 +-
 framework/View/lib/Horde/View/Helper/Url.php                      |    2 +-
 framework/View/test/Horde/View/BaseTest.php                       |    2 +-
 framework/View/test/Horde/View/Helper/BenchmarkTest.php           |    2 +-
 framework/View/test/Horde/View/Helper/CaptureTest.php             |    2 +-
 framework/View/test/Horde/View/Helper/DateTest.php                |    2 +-
 framework/View/test/Horde/View/Helper/DebugTest.php               |    2 +-
 framework/View/test/Horde/View/Helper/FormTagTest.php             |    2 +-
 framework/View/test/Horde/View/Helper/FormTest.php                |    2 +-
 framework/View/test/Horde/View/Helper/JavascriptTest.php          |    2 +-
 framework/View/test/Horde/View/Helper/NumberTest.php              |    2 +-
 framework/View/test/Horde/View/Helper/TagTest.php                 |    2 +-
 framework/View/test/Horde/View/Helper/TextTest.php                |    2 +-
 framework/View/test/Horde/View/Helper/UrlTest.php                 |    2 +-
 framework/View/test/Horde/View/InterfaceTest.php                  |    2 +-
 framework/Xml_Element/doc/Horde/Xml/Element/COPYING               |    2 +-
 framework/Xml_Element/lib/Horde/Xml/Element.php                   |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml.php                       |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/ContentHandler.php        |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/Decoder.php               |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/Dtd.php                   |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/Dtd/SyncMl.php            |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/Dtd/SyncMlDevInf.php      |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/Dtd/SyncMlMetInf.php      |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/DtdManager.php            |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/Encoder.php               |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/Exception.php             |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/HashTable.php             |    2 +-
 framework/Xml_Wbxml/lib/Horde/Xml/Wbxml/LifoQueue.php             |    2 +-
 framework/Yaml/doc/Horde/Yaml/COPYING                             |    2 +-
 framework/Yaml/test/Horde/Yaml/Autoload.php                       |    2 +-
 framework/admintools/horde-remove-pref.php                        |    2 +-
 framework/admintools/horde-sql-shell.php                          |    2 +-
 framework/bin/install_framework                                   |    2 +-
 framework/devtools/horde-generate-module.php                      |    2 +-
 gollem/clipboard.php                                              |    2 +-
 gollem/config/backends.php                                        |    3 -
 gollem/config/prefs.php                                           |    4 +-
 gollem/docs/CHANGES                                               |    3 +
 gollem/edit.php                                                   |    2 +-
 gollem/index.php                                                  |    2 +-
 gollem/js/login.js                                                |    2 +-
 gollem/lib/Api.php                                                |    2 +-
 gollem/lib/Application.php                                        |   12 +-
 gollem/lib/Auth.php                                               |   14 +-
 gollem/lib/Exception.php                                          |    2 +-
 gollem/lib/Factory/Vfs.php                                        |    2 +-
 gollem/lib/Factory/VfsDefault.php                                 |    2 +-
 gollem/lib/Gollem.php                                             |   32 +++-
 gollem/lib/LoginTasks/SystemTask/Upgrade.php                      |    2 +-
 gollem/lib/Prefs/Special/Columnselect.php                         |   19 +-
 gollem/lib/Test.php                                               |    2 +-
 gollem/locale/bg/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/ca/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/cs/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/da/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/de/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/es/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/hr/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/it/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/ja/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/lv/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/pl/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/pt_BR/LC_MESSAGES/gollem.po                         |    2 +-
 gollem/locale/ro/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/sk/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/sl/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/tr/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/locale/uk/LC_MESSAGES/gollem.po                            |    2 +-
 gollem/manager.php                                                |   11 +-
 gollem/migration/1_gollem_base_tables.php                         |    2 +-
 gollem/migration/2_gollem_upgrade_autoincrement.php               |    2 +-
 gollem/package.xml                                                |    8 +-
 gollem/quota.php                                                  |    2 +-
 gollem/selectlist.php                                             |    2 +-
 gollem/share.php                                                  |    2 +-
 gollem/view.php                                                   |    2 +-
 hermes/LICENSE                                                    |    2 +-
 hermes/admin.php                                                  |    2 +-
 hermes/bin/hermes-purge                                           |    2 +-
 hermes/deliverables.php                                           |    2 +-
 hermes/entry.php                                                  |    2 +-
 hermes/index.php                                                  |    2 +-
 hermes/invoicing.php                                              |    2 +-
 hermes/js/hermes.js                                               |    2 +-
 hermes/lib/Ajax.php                                               |    2 +-
 hermes/lib/Ajax/Application.php                                   |    2 +-
 hermes/lib/Ajax/Application/Handler.php                           |    2 +-
 hermes/lib/Application.php                                        |    2 +-
 hermes/lib/Data/Iif.php                                           |    2 +-
 hermes/lib/Form/Admin/AddJobType.php                              |    2 +-
 hermes/lib/Form/Admin/DeleteJobType.php                           |    2 +-
 hermes/lib/Form/Admin/EditClientStepOne.php                       |    2 +-
 hermes/lib/Form/Admin/EditClientStepTwo.php                       |    2 +-
 hermes/lib/Form/Admin/EditJobTypeStepOne.php                      |    2 +-
 hermes/lib/Form/Admin/EditJobTypeStepTwo.php                      |    2 +-
 hermes/lib/Form/Deliverable.php                                   |    2 +-
 hermes/lib/Form/Deliverable/ClientSelector.php                    |    2 +-
 hermes/lib/Form/Export.php                                        |    2 +-
 hermes/lib/Form/JobType/Add.php                                   |    2 +-
 hermes/lib/Form/JobType/Edit/Step1.php                            |    2 +-
 hermes/lib/Form/Search.php                                        |    2 +-
 hermes/lib/Form/Time.php                                          |    2 +-
 hermes/lib/Form/Time/Entry.php                                    |    2 +-
 hermes/lib/LoginTasks/SystemTask/Upgrade.php                      |    2 +-
 hermes/lib/Slice.php                                              |    2 +-
 hermes/lib/View/Sidebar.php                                       |    2 +-
 hermes/locale/de/LC_MESSAGES/hermes.po                            |    2 +-
 hermes/locale/es/LC_MESSAGES/hermes.po                            |    2 +-
 hermes/locale/lv/LC_MESSAGES/hermes.po                            |    2 +-
 hermes/migration/1_hermes_base_tables.php                         |    2 +-
 hermes/migration/2_hermes_autoincrement.php                       |    2 +-
 hermes/search.php                                                 |    2 +-
 hermes/start.php                                                  |    2 +-
 hermes/time.php                                                   |    2 +-
 horde/admin/activesync.php                                        |    2 +-
 horde/admin/alarms.php                                            |    2 +-
 horde/admin/cmdshell.php                                          |    2 +-
 horde/admin/config/config.php                                     |    2 +-
 horde/admin/config/diff.php                                       |    2 +-
 horde/admin/config/index.php                                      |    2 +-
 horde/admin/config/scripts.php                                    |    2 +-
 horde/admin/groups.php                                            |    2 +-
 horde/admin/locks.php                                             |    2 +-
 horde/admin/perms/addchild.php                                    |    2 +-
 horde/admin/perms/delete.php                                      |    2 +-
 horde/admin/perms/edit.php                                        |    2 +-
 horde/admin/perms/index.php                                       |    2 +-
 horde/admin/phpshell.php                                          |    2 +-
 horde/admin/sessions.php                                          |    2 +-
 horde/admin/signup_confirm.php                                    |    2 +-
 horde/admin/sqlshell.php                                          |    2 +-
 horde/admin/user.php                                              |    2 +-
 horde/bin/horde-active-sessions                                   |    2 +-
 horde/bin/horde-alarms                                            |    2 +-
 horde/bin/horde-check-logger                                      |    2 +-
 horde/bin/horde-clear-cache                                       |    2 +-
 horde/bin/horde-crond                                             |    2 +-
 horde/bin/horde-db-migrate                                        |    2 +-
 horde/bin/horde-import-squirrelmail-prefs                         |    2 +-
 horde/bin/horde-memcache-stats                                    |    2 +-
 horde/bin/horde-run-task                                          |    2 +-
 horde/bin/horde-set-perms                                         |    2 +-
 horde/bin/horde-themes                                            |    2 +-
 horde/docs/CODING_STANDARDS                                       |    4 +-
 horde/docs/INSTALL                                                |    8 +-
 horde/docs/TRANSLATIONS                                           |    2 +-
 horde/index.php                                                   |    2 +-
 horde/install/horde.php                                           |    6 +-
 horde/js/dragdrop2.js                                             |    2 +-
 horde/js/form_ghost.js                                            |    2 +-
 horde/js/form_sections.js                                         |    2 +-
 horde/js/slider2.js                                               |    2 +-
 horde/lib/Ajax/Application.php                                    |    2 +-
 horde/lib/Ajax/Application/Handler.php                            |    2 +-
 horde/lib/Application.php                                         |    2 +-
 horde/lib/Block/Account.php                                       |    2 +-
 horde/lib/Block/Account/Base.php                                  |    2 +-
 horde/lib/Block/Account/Finger.php                                |    2 +-
 horde/lib/Block/Account/Ldap.php                                  |    2 +-
 horde/lib/Block/Account/Localhost.php                             |    2 +-
 horde/lib/Block/FbStream.php                                      |    2 +-
 horde/lib/Block/TwitterTimeline.php                               |    2 +-
 horde/lib/Block/Weather.php                                       |    2 +-
 horde/lib/LoginTasks/SystemTask/GarbageCollection.php             |    2 +-
 horde/lib/LoginTasks/SystemTask/Upgrade.php                       |    2 +-
 horde/lib/LoginTasks/Task/AdminCheck.php                          |    2 +-
 horde/lib/LoginTasks/Task/LastLogin.php                           |    2 +-
 horde/lib/LoginTasks/Task/TosAgreement.php                        |    2 +-
 horde/lib/Prefs/Special/Activesync.php                            |    2 +-
 horde/lib/Prefs/Special/Category.php                              |    2 +-
 horde/lib/Prefs/Special/Facebook.php                              |    2 +-
 horde/lib/Prefs/Special/Syncml.php                                |    2 +-
 horde/lib/Prefs/Special/Twitter.php                               |    2 +-
 horde/lib/Test.php                                                |    2 +-
 horde/lib/Tree/Renderer/Menu.php                                  |    2 +-
 horde/lib/Tree/Renderer/Sidebar.php                               |    2 +-
 horde/lib/View/Sidebar.php                                        |    2 +-
 horde/lib/View/Topbar.php                                         |    2 +-
 horde/lib/core.php                                                |    2 +-
 horde/locale/bg/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/bs/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/ca/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/cs/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/da/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/de/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/es/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/fr/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/hr/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/hu/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/id/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/is/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/ja/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/km/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/ko/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/lt/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/lv/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/nb/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/pl/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/pt_BR/LC_MESSAGES/horde.po                           |    2 +-
 horde/locale/ro/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/ru/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/sk/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/sl/LC_MESSAGES/horde.po                              |    2 +-
 horde/locale/tr/LC_MESSAGES/horde.po                              |    2 +-
 horde/login.php                                                   |    2 +-
 horde/rpc.php                                                     |    2 +-
 horde/rpc/index.php                                               |    2 +-
 horde/scripts/cookie_login.php                                    |    2 +-
 horde/scripts/get_login.php                                       |    2 +-
 horde/scripts/http_login.php                                      |    2 +-
 horde/services/ajax.php                                           |    2 +-
 horde/services/cache.php                                          |    2 +-
 horde/services/cacheview.php                                      |    2 +-
 horde/services/changepassword.php                                 |    2 +-
 horde/services/confirm.php                                        |    2 +-
 horde/services/download/index.php                                 |    2 +-
 horde/services/facebook/index.php                                 |    2 +-
 horde/services/go.php                                             |    2 +-
 horde/services/help/index.php                                     |    2 +-
 horde/services/images/pixel.php                                   |    2 +-
 horde/services/images/view.php                                    |    2 +-
 horde/services/language.php                                       |    2 +-
 horde/services/logintasks.php                                     |    2 +-
 horde/services/obrowser/index.php                                 |    2 +-
 horde/services/portal/cloud_search.php                            |    2 +-
 horde/services/portal/edit.php                                    |    2 +-
 horde/services/portal/index.php                                   |    2 +-
 horde/services/portal/smartmobile.php                             |    2 +-
 horde/services/prefs.php                                          |    2 +-
 horde/services/problem.php                                        |    2 +-
 horde/services/resetpassword.php                                  |    2 +-
 horde/services/shares/edit.php                                    |    2 +-
 horde/services/snooze.php                                         |    2 +-
 horde/services/twitter/index.php                                  |    2 +-
 horde/signup.php                                                  |    2 +-
 horde/templates/prefs/source.html                                 |    3 +
 horde/test.php                                                    |    2 +-
 horde/util/barcode.php                                            |    2 +-
 horde/util/icon_browser.php                                       |    2 +-
 hylax/compose.php                                                 |    2 +-
 hylax/index.php                                                   |    2 +-
 hylax/lib/Application.php                                         |    2 +-
 hylax/lib/Driver.php                                              |    2 +-
 hylax/lib/Driver/hylafax.php                                      |    2 +-
 hylax/lib/Driver/spandsp.php                                      |    2 +-
 hylax/lib/Hylax.php                                               |    2 +-
 hylax/lib/Image.php                                               |    2 +-
 hylax/lib/SQL/Attributes.php                                      |    2 +-
 hylax/lib/Storage.php                                             |    2 +-
 hylax/lib/Storage/sql.php                                         |    2 +-
 iPhoto2Ansel/AnselExportController.h                              |    2 +-
 iPhoto2Ansel/AnselExportController.m                              |    2 +-
 iPhoto2Ansel/AnselExportPluginBox.h                               |    2 +-
 iPhoto2Ansel/AnselExportPluginBox.m                               |    2 +-
 iPhoto2Ansel/COPYING                                              |    2 +-
 iPhoto2Ansel/TURAnselKit/AnselGalleryViewItem.h                   |    2 +-
 iPhoto2Ansel/TURAnselKit/AnselGalleryViewItem.m                   |    2 +-
 iPhoto2Ansel/TURAnselKit/TURAnsel.h                               |    2 +-
 iPhoto2Ansel/TURAnselKit/TURAnsel.m                               |    2 +-
 iPhoto2Ansel/TURAnselKit/TURAnselConstants.h                      |    2 +-
 iPhoto2Ansel/TURAnselKit/TURAnselConstants.m                      |    2 +-
 iPhoto2Ansel/TURAnselKit/TURAnselGallery.h                        |    2 +-
 iPhoto2Ansel/TURAnselKit/TURAnselGallery.m                        |    2 +-
 iPhoto2Ansel/TURAnselKit/TURAnselGalleryPanelController.h         |    2 +-
 iPhoto2Ansel/TURAnselKit/TURAnselGalleryPanelController.m         |    2 +-
 imp/bin/imp-bounce-spam                                           |    2 +-
 imp/bin/imp-mailbox-decode                                        |    2 +-
 imp/bin/imp-query-imap-cache                                      |    2 +-
 imp/compose.php                                                   |    2 +-
 imp/contacts.php                                                  |    2 +-
 imp/docs/RELEASE_NOTES                                            |   28 ++-
 imp/dynamic.php                                                   |    2 +-
 imp/folders.php                                                   |    2 +-
 imp/index.php                                                     |    2 +-
 imp/js/compose-dimp.js                                            |    2 +-
 imp/js/dimpbase.js                                                |    2 +-
 imp/js/dimpcore.js                                                |    2 +-
 imp/js/indices.js                                                 |    2 +-
 imp/js/message-dimp.js                                            |    2 +-
 imp/js/message.js                                                 |    2 +-
 imp/js/smartmobile.js                                             |    6 +-
 imp/js/viewport.js                                                |    2 +-
 imp/lib/Ajax/Application.php                                      |    6 +-
 imp/lib/Ajax/Application/Compose.php                              |    6 +-
 imp/lib/Ajax/Application/Handler/Common.php                       |    6 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php                      |    6 +-
 imp/lib/Ajax/Application/Handler/ImageUnblock.php                 |    6 +-
 imp/lib/Ajax/Application/Handler/Passphrase.php                   |    6 +-
 imp/lib/Ajax/Application/Handler/Search.php                       |    6 +-
 imp/lib/Ajax/Application/Handler/Smartmobile.php                  |    6 +-
 imp/lib/Ajax/Application/ListMessages.php                         |    6 +-
 imp/lib/Ajax/Application/ShowMessage.php                          |    6 +-
 imp/lib/Ajax/Imple/ContactAutoCompleter.php                       |    6 +-
 imp/lib/Ajax/Imple/ImportEncryptKey.php                           |    6 +-
 imp/lib/Ajax/Imple/ItipRequest.php                                |    6 +-
 imp/lib/Ajax/Imple/PassphraseDialog.php                           |    6 +-
 imp/lib/Ajax/Queue.php                                            |    6 +-
 imp/lib/Api.php                                                   |    6 +-
 imp/lib/Application.php                                           |    6 +-
 imp/lib/Auth.php                                                  |    6 +-
 imp/lib/Block/Newmail.php                                         |    6 +-
 imp/lib/Block/Summary.php                                         |    6 +-
 imp/lib/Compose.php                                               |    6 +-
 imp/lib/Compose/Exception.php                                     |    6 +-
 imp/lib/Compose/References.php                                    |    2 +-
 imp/lib/Compose/View.php                                          |    6 +-
 imp/lib/Contents.php                                              |    6 +-
 imp/lib/Contents/View.php                                         |    6 +-
 imp/lib/Crypt/Pgp.php                                             |    6 +-
 imp/lib/Crypt/Smime.php                                           |    6 +-
 imp/lib/Dynamic/AddressList.php                                   |    6 +-
 imp/lib/Dynamic/Base.php                                          |    6 +-
 imp/lib/Dynamic/Compose.php                                       |    6 +-
 imp/lib/Dynamic/Compose/Common.php                                |    6 +-
 imp/lib/Dynamic/Helper/Base.php                                   |    6 +-
 imp/lib/Dynamic/Mailbox.php                                       |    6 +-
 imp/lib/Dynamic/Message.php                                       |    6 +-
 imp/lib/Exception.php                                             |    6 +-
 imp/lib/Factory/AuthImap.php                                      |    6 +-
 imp/lib/Factory/Compose.php                                       |    6 +-
 imp/lib/Factory/Contents.php                                      |    6 +-
 imp/lib/Factory/Flags.php                                         |    6 +-
 imp/lib/Factory/Identity.php                                      |    6 +-
 imp/lib/Factory/Imap.php                                          |    6 +-
 imp/lib/Factory/Imaptree.php                                      |    6 +-
 imp/lib/Factory/Mail.php                                          |    6 +-
 imp/lib/Factory/Mailbox.php                                       |    6 +-
 imp/lib/Factory/MailboxList.php                                   |    6 +-
 imp/lib/Factory/MimeViewer.php                                    |    6 +-
 imp/lib/Factory/Pgp.php                                           |    6 +-
 imp/lib/Factory/PrefsSort.php                                     |    6 +-
 imp/lib/Factory/Quota.php                                         |    6 +-
 imp/lib/Factory/Search.php                                        |    6 +-
 imp/lib/Factory/Sentmail.php                                      |    6 +-
 imp/lib/Factory/Smime.php                                         |    6 +-
 imp/lib/Filter.php                                                |    6 +-
 imp/lib/Flag/Base.php                                             |    6 +-
 imp/lib/Flag/Imap.php                                             |    6 +-
 imp/lib/Flag/Imap/Answered.php                                    |    6 +-
 imp/lib/Flag/Imap/Deleted.php                                     |    6 +-
 imp/lib/Flag/Imap/Draft.php                                       |    6 +-
 imp/lib/Flag/Imap/Flagged.php                                     |    6 +-
 imp/lib/Flag/Imap/Forwarded.php                                   |    6 +-
 imp/lib/Flag/Imap/Junk.php                                        |    6 +-
 imp/lib/Flag/Imap/NotJunk.php                                     |    6 +-
 imp/lib/Flag/Imap/Seen.php                                        |    6 +-
 imp/lib/Flag/System/Attachment.php                                |    6 +-
 imp/lib/Flag/System/Encrypted.php                                 |    6 +-
 imp/lib/Flag/System/HighPriority.php                              |    6 +-
 imp/lib/Flag/System/List.php                                      |    6 +-
 imp/lib/Flag/System/LowPriority.php                               |    6 +-
 imp/lib/Flag/System/Match/Address.php                             |    6 +-
 imp/lib/Flag/System/Match/Flag.php                                |    6 +-
 imp/lib/Flag/System/Match/Header.php                              |    6 +-
 imp/lib/Flag/System/Personal.php                                  |    6 +-
 imp/lib/Flag/System/Signed.php                                    |    6 +-
 imp/lib/Flag/System/Unseen.php                                    |    6 +-
 imp/lib/Flag/User.php                                             |    6 +-
 imp/lib/Flags.php                                                 |    6 +-
 imp/lib/IMP.php                                                   |    6 +-
 imp/lib/Imap.php                                                  |    6 +-
 imp/lib/Imap/Acl.php                                              |    6 +-
 imp/lib/Imap/Exception.php                                        |    6 +-
 imp/lib/Imap/PermanentFlags.php                                   |    6 +-
 imp/lib/Imap/Tree.php                                             |    6 +-
 imp/lib/Indices.php                                               |    6 +-
 imp/lib/Indices/Form.php                                          |    6 +-
 imp/lib/LoginTasks/SystemTask/GarbageCollection.php               |    6 +-
 imp/lib/LoginTasks/SystemTask/Upgrade.php                         |    6 +-
 imp/lib/LoginTasks/SystemTask/UpgradeAuth.php                     |    6 +-
 imp/lib/LoginTasks/Task/Autocreate.php                            |    6 +-
 imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php                 |    6 +-
 imp/lib/LoginTasks/Task/FilterOnLogin.php                         |    6 +-
 imp/lib/LoginTasks/Task/PurgeSentmail.php                         |    6 +-
 imp/lib/LoginTasks/Task/PurgeSpam.php                             |    6 +-
 imp/lib/LoginTasks/Task/PurgeTrash.php                            |    6 +-
 imp/lib/LoginTasks/Task/RecoverDraft.php                          |    6 +-
 imp/lib/LoginTasks/Task/RenameSentmailMonthly.php                 |    6 +-
 imp/lib/Mailbox.php                                               |    6 +-
 imp/lib/Mailbox/List.php                                          |    6 +-
 imp/lib/Mailbox/List/Thread.php                                   |    6 +-
 imp/lib/Maillog.php                                               |    6 +-
 imp/lib/Mbox/Parse.php                                            |    6 +-
 imp/lib/Message.php                                               |    6 +-
 imp/lib/Mime/Status.php                                           |    6 +-
 imp/lib/Mime/Viewer/Alternative.php                               |    6 +-
 imp/lib/Mime/Viewer/Appledouble.php                               |    6 +-
 imp/lib/Mime/Viewer/Audio.php                                     |    6 +-
 imp/lib/Mime/Viewer/Enriched.php                                  |    6 +-
 imp/lib/Mime/Viewer/Externalbody.php                              |    6 +-
 imp/lib/Mime/Viewer/Html.php                                      |    6 +-
 imp/lib/Mime/Viewer/Images.php                                    |    6 +-
 imp/lib/Mime/Viewer/Itip.php                                      |    6 +-
 imp/lib/Mime/Viewer/Mdn.php                                       |    6 +-
 imp/lib/Mime/Viewer/Partial.php                                   |    6 +-
 imp/lib/Mime/Viewer/Pdf.php                                       |    6 +-
 imp/lib/Mime/Viewer/Pgp.php                                       |    6 +-
 imp/lib/Mime/Viewer/Plain.php                                     |    6 +-
 imp/lib/Mime/Viewer/Related.php                                   |    6 +-
 imp/lib/Mime/Viewer/Rfc822.php                                    |    6 +-
 imp/lib/Mime/Viewer/Smil.php                                      |    6 +-
 imp/lib/Mime/Viewer/Smime.php                                     |    6 +-
 imp/lib/Mime/Viewer/Status.php                                    |    6 +-
 imp/lib/Mime/Viewer/Vcard.php                                     |    6 +-
 imp/lib/Mime/Viewer/Video.php                                     |    6 +-
 imp/lib/Mime/Viewer/Zip.php                                       |    6 +-
 imp/lib/Minimal/Base.php                                          |    2 +-
 imp/lib/Minimal/Compose.php                                       |    2 +-
 imp/lib/Minimal/Folders.php                                       |    2 +-
 imp/lib/Minimal/Mailbox.php                                       |    2 +-
 imp/lib/Minimal/Message.php                                       |    2 +-
 imp/lib/Minimal/Messagepart.php                                   |    2 +-
 imp/lib/Minimal/Search.php                                        |    2 +-
 imp/lib/Notification/Event/Status.php                             |    2 +-
 imp/lib/Notification/Handler/Decorator/ImapAlerts.php             |    2 +-
 imp/lib/Notification/Handler/Decorator/NewmailNotify.php          |    2 +-
 imp/lib/Prefs/Identity.php                                        |    2 +-
 imp/lib/Prefs/Sort.php                                            |    2 +-
 imp/lib/Prefs/Sort/Fixed.php                                      |    2 +-
 imp/lib/Prefs/Sort/Sortpref.php                                   |    2 +-
 imp/lib/Prefs/Special/Acl.php                                     |    2 +-
 imp/lib/Prefs/Special/ComposeTemplates.php                        |    2 +-
 imp/lib/Prefs/Special/Drafts.php                                  |    2 +-
 imp/lib/Prefs/Special/Encrypt.php                                 |    2 +-
 imp/lib/Prefs/Special/Flag.php                                    |    2 +-
 imp/lib/Prefs/Special/HtmlSignature.php                           |    2 +-
 imp/lib/Prefs/Special/ImageReplacement.php                        |    2 +-
 imp/lib/Prefs/Special/InitialPage.php                             |    2 +-
 imp/lib/Prefs/Special/Mailto.php                                  |    2 +-
 imp/lib/Prefs/Special/NewmailSound.php                            |    2 +-
 imp/lib/Prefs/Special/PgpPrivateKey.php                           |    2 +-
 imp/lib/Prefs/Special/PgpPublicKey.php                            |    2 +-
 imp/lib/Prefs/Special/Searches.php                                |    2 +-
 imp/lib/Prefs/Special/Sentmail.php                                |    2 +-
 imp/lib/Prefs/Special/SmimePrivateKey.php                         |    2 +-
 imp/lib/Prefs/Special/SmimePublicKey.php                          |    2 +-
 imp/lib/Prefs/Special/Sourceselect.php                            |    2 +-
 imp/lib/Prefs/Special/Spam.php                                    |    2 +-
 imp/lib/Prefs/Special/SpecialMboxes.php                           |    2 +-
 imp/lib/Prefs/Special/Trash.php                                   |    2 +-
 imp/lib/Quota.php                                                 |    2 +-
 imp/lib/Quota/Command.php                                         |    2 +-
 imp/lib/Quota/Hook.php                                            |    2 +-
 imp/lib/Quota/Imap.php                                            |    2 +-
 imp/lib/Quota/Maildir.php                                         |    2 +-
 imp/lib/Quota/Mdaemon.php                                         |    2 +-
 imp/lib/Quota/Mercury32.php                                       |    2 +-
 imp/lib/Quota/Null.php                                            |    2 +-
 imp/lib/Quota/Sql.php                                             |    2 +-
 imp/lib/Script/Package/ComposeBase.php                            |    2 +-
 imp/lib/Script/Package/Imp.php                                    |    2 +-
 imp/lib/Search.php                                                |    2 +-
 imp/lib/Search/Element.php                                        |    2 +-
 imp/lib/Search/Element/Attachment.php                             |    2 +-
 imp/lib/Search/Element/Autogenerated.php                          |    2 +-
 imp/lib/Search/Element/Bulk.php                                   |    2 +-
 imp/lib/Search/Element/Contacts.php                               |    2 +-
 imp/lib/Search/Element/Date.php                                   |    2 +-
 imp/lib/Search/Element/Daterange.php                              |    2 +-
 imp/lib/Search/Element/Flag.php                                   |    2 +-
 imp/lib/Search/Element/Header.php                                 |    2 +-
 imp/lib/Search/Element/Mailinglist.php                            |    2 +-
 imp/lib/Search/Element/Or.php                                     |    2 +-
 imp/lib/Search/Element/Personal.php                               |    2 +-
 imp/lib/Search/Element/Recipient.php                              |    2 +-
 imp/lib/Search/Element/Size.php                                   |    2 +-
 imp/lib/Search/Element/Text.php                                   |    2 +-
 imp/lib/Search/Element/Within.php                                 |    2 +-
 imp/lib/Search/Filter.php                                         |    2 +-
 imp/lib/Search/Filter/Attachment.php                              |    2 +-
 imp/lib/Search/Filter/Autogenerated.php                           |    2 +-
 imp/lib/Search/Filter/Builtin.php                                 |    2 +-
 imp/lib/Search/Filter/Bulk.php                                    |    2 +-
 imp/lib/Search/Filter/Contacts.php                                |    2 +-
 imp/lib/Search/Filter/Mailinglist.php                             |    2 +-
 imp/lib/Search/Filter/Personal.php                                |    2 +-
 imp/lib/Search/Query.php                                          |    2 +-
 imp/lib/Search/Vfolder.php                                        |    2 +-
 imp/lib/Search/Vfolder/Builtin.php                                |    2 +-
 imp/lib/Search/Vfolder/Vinbox.php                                 |    2 +-
 imp/lib/Search/Vfolder/Vtrash.php                                 |    2 +-
 imp/lib/Sentmail.php                                              |    2 +-
 imp/lib/Sentmail/Null.php                                         |    6 +-
 imp/lib/Sentmail/Sql.php                                          |    6 +-
 imp/lib/Smartmobile.php                                           |    2 +-
 imp/lib/Spam.php                                                  |    2 +-
 imp/lib/Test.php                                                  |    2 +-
 imp/lib/Tree/Flist.php                                            |    2 +-
 imp/lib/Tree/Jquerymobile.php                                     |    2 +-
 imp/lib/Tree/Simplehtml.php                                       |    2 +-
 imp/lib/Ui/Compose.php                                            |    2 +-
 imp/lib/Ui/Contacts.php                                           |    2 +-
 imp/lib/Ui/Editor.php                                             |    2 +-
 imp/lib/Ui/Folder.php                                             |    2 +-
 imp/lib/Ui/Headers.php                                            |    2 +-
 imp/lib/Ui/Imageview.php                                          |    2 +-
 imp/lib/Ui/Mailbox.php                                            |    2 +-
 imp/lib/Ui/Message.php                                            |    2 +-
 imp/lib/Ui/Quota.php                                              |    2 +-
 imp/lib/Ui/Search.php                                             |    2 +-
 imp/lib/View/Subinfo.php                                          |    2 +-
 imp/locale/bg/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/bs/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/ca/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/cs/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/da/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/de/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/es/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/fr/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/hr/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/hu/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/id/LC_MESSAGES/imp.po                                  |   10 +-
 imp/locale/is/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/it/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/ja/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/km/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/ko/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/lt/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/nb/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/nl/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/pl/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/pt_BR/LC_MESSAGES/imp.po                               |    2 +-
 imp/locale/ro/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/sk/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/sl/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/sv/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/th/LC_MESSAGES/imp.po                                  |    2 +-
 imp/locale/tr/LC_MESSAGES/imp.po                                  |    2 +-
 imp/mailbox.php                                                   |    2 +-
 imp/message.php                                                   |    2 +-
 imp/migration/1_imp_base_tables.php                               |    2 +-
 imp/migration/2_imp_autoincrement_sentmail.php                    |    2 +-
 imp/minimal.php                                                   |    2 +-
 imp/pgp.php                                                       |    2 +-
 imp/rss.php                                                       |    2 +-
 imp/saveimage.php                                                 |    2 +-
 imp/search-basic.php                                              |    2 +-
 imp/search.php                                                    |    2 +-
 imp/smartmobile.php                                               |    2 +-
 imp/smime.php                                                     |    2 +-
 imp/test/Imp/Stub/HtmlViewer.php                                  |    6 +-
 imp/test/Imp/Stub/ItipRequest.php                                 |    6 +-
 imp/test/Imp/Unit/ComposeTest.php                                 |    6 +-
 imp/test/Imp/Unit/MboxParseTest.php                               |    6 +-
 imp/test/Imp/Unit/Mime/Viewer/HtmlTest.php                        |    6 +-
 imp/test/Imp/Unit/Mime/Viewer/ItipTest.php                        |    6 +-
 imp/test/Imp/Unit/QuotaTest.php                                   |    6 +-
 imp/test/Imp/Unit/ReferencesTest.php                              |    6 +-
 imp/thread.php                                                    |    2 +-
 imp/view.php                                                      |    2 +-
 ingo/LICENSE                                                      |    2 +-
 ingo/bin/ingo-convert-prefs-to-sql                                |    2 +-
 ingo/bin/ingo-convert-sql-shares-to-sqlng                         |    2 +-
 ingo/bin/ingo-postfix-policyd                                     |    2 +-
 ingo/blacklist.php                                                |    2 +-
 ingo/filters.php                                                  |    2 +-
 ingo/forward.php                                                  |    2 +-
 ingo/index.php                                                    |    2 +-
 ingo/js/smartmobile.js                                            |    2 +-
 ingo/lib/Ajax/Application.php                                     |    2 +-
 ingo/lib/Ajax/Application/Smartmobile.php                         |    2 +-
 ingo/lib/Api.php                                                  |    2 +-
 ingo/lib/Application.php                                          |    2 +-
 ingo/lib/Block/Overview.php                                       |    2 +-
 ingo/lib/Exception.php                                            |    2 +-
 ingo/lib/Exception/Pear.php                                       |    2 +-
 ingo/lib/Factory/Script.php                                       |    2 +-
 ingo/lib/Factory/Storage.php                                      |    2 +-
 ingo/lib/Factory/Transport.php                                    |    2 +-
 ingo/lib/Form/Base.php                                            |    2 +-
 ingo/lib/Form/Forward.php                                         |    2 +-
 ingo/lib/Form/Spam.php                                            |    2 +-
 ingo/lib/Form/Vacation.php                                        |    2 +-
 ingo/lib/Ingo.php                                                 |    2 +-
 ingo/lib/LoginTasks/SystemTask/Upgrade.php                        |    2 +-
 ingo/lib/Script.php                                               |    2 +-
 ingo/lib/Script/Imap.php                                          |    2 +-
 ingo/lib/Script/Imap/Api.php                                      |    2 +-
 ingo/lib/Script/Imap/Live.php                                     |    2 +-
 ingo/lib/Script/Imap/Mock.php                                     |    2 +-
 ingo/lib/Script/Procmail.php                                      |    2 +-
 ingo/lib/Script/Procmail/Comment.php                              |    2 +-
 ingo/lib/Script/Procmail/Recipe.php                               |    2 +-
 ingo/lib/Script/Procmail/Variable.php                             |    2 +-
 ingo/lib/Script/Sieve/Action.php                                  |    2 +-
 ingo/lib/Script/Sieve/Action/Addflag.php                          |    2 +-
 ingo/lib/Script/Sieve/Action/Discard.php                          |    2 +-
 ingo/lib/Script/Sieve/Action/Fileinto.php                         |    2 +-
 ingo/lib/Script/Sieve/Action/Flag.php                             |    2 +-
 ingo/lib/Script/Sieve/Action/Keep.php                             |    2 +-
 ingo/lib/Script/Sieve/Action/Notify.php                           |    2 +-
 ingo/lib/Script/Sieve/Action/Redirect.php                         |    2 +-
 ingo/lib/Script/Sieve/Action/Reject.php                           |    2 +-
 ingo/lib/Script/Sieve/Action/Removeflag.php                       |    2 +-
 ingo/lib/Script/Sieve/Action/Stop.php                             |    2 +-
 ingo/lib/Script/Sieve/Action/Vacation.php                         |    2 +-
 ingo/lib/Script/Sieve/Comment.php                                 |    2 +-
 ingo/lib/Script/Sieve/Else.php                                    |    2 +-
 ingo/lib/Script/Sieve/Elsif.php                                   |    2 +-
 ingo/lib/Script/Sieve/If.php                                      |    2 +-
 ingo/lib/Script/Sieve/Test.php                                    |    2 +-
 ingo/lib/Script/Sieve/Test/Address.php                            |    2 +-
 ingo/lib/Script/Sieve/Test/Allof.php                              |    2 +-
 ingo/lib/Script/Sieve/Test/Anyof.php                              |    2 +-
 ingo/lib/Script/Sieve/Test/Body.php                               |    2 +-
 ingo/lib/Script/Sieve/Test/Exists.php                             |    2 +-
 ingo/lib/Script/Sieve/Test/False.php                              |    2 +-
 ingo/lib/Script/Sieve/Test/Header.php                             |    2 +-
 ingo/lib/Script/Sieve/Test/Not.php                                |    2 +-
 ingo/lib/Script/Sieve/Test/Relational.php                         |    2 +-
 ingo/lib/Script/Sieve/Test/Size.php                               |    2 +-
 ingo/lib/Script/Sieve/Test/True.php                               |    2 +-
 ingo/lib/Smartmobile.php                                          |    2 +-
 ingo/lib/Storage.php                                              |    2 +-
 ingo/lib/Storage/Blacklist.php                                    |    2 +-
 ingo/lib/Storage/Filters.php                                      |    2 +-
 ingo/lib/Storage/Filters/Sql.php                                  |    2 +-
 ingo/lib/Storage/Forward.php                                      |    2 +-
 ingo/lib/Storage/Mock.php                                         |    2 +-
 ingo/lib/Storage/Prefs.php                                        |    2 +-
 ingo/lib/Storage/Rule.php                                         |    2 +-
 ingo/lib/Storage/Spam.php                                         |    2 +-
 ingo/lib/Storage/Sql.php                                          |    2 +-
 ingo/lib/Storage/Vacation.php                                     |    2 +-
 ingo/lib/Storage/VacationTest.php                                 |    2 +-
 ingo/lib/Storage/Whitelist.php                                    |    2 +-
 ingo/lib/Test.php                                                 |    2 +-
 ingo/lib/Transport.php                                            |    2 +-
 ingo/lib/Transport/Ldap.php                                       |    2 +-
 ingo/lib/Transport/Null.php                                       |    2 +-
 ingo/lib/Transport/Sivtest.php                                    |    2 +-
 ingo/lib/Transport/Timsieved.php                                  |    2 +-
 ingo/lib/Transport/Vfs.php                                        |    2 +-
 ingo/lib/Ui/VarRenderer/Ingo.php                                  |    2 +-
 ingo/lib/tests/AllTests.php                                       |    2 +-
 ingo/locale/ca/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/cs/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/da/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/de/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/el/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/es/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/fr/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/hr/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/hu/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/it/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/ja/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/ko/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/lt/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/lv/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/nb/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/nl/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/pl/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/pt/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/pt_BR/LC_MESSAGES/ingo.po                             |    2 +-
 ingo/locale/ro/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/sk/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/sl/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/tr/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/uk/LC_MESSAGES/ingo.po                                |    2 +-
 ingo/locale/zh_CN/LC_MESSAGES/ingo.po                             |    2 +-
 ingo/migration/1_ingo_base_tables.php                             |    2 +-
 ingo/migration/2_ingo_upgrade_autoincrement.php                   |    2 +-
 ingo/migration/3_ingo_upgrade_sqlng.php                           |    2 +-
 ingo/migration/4_ingo_upgrade_sqlhierarchical.php                 |    2 +-
 ingo/migration/5_ingo_upgrade_sqlnghierarchical.php               |    2 +-
 ingo/rule.php                                                     |    2 +-
 ingo/script.php                                                   |    2 +-
 ingo/smartmobile.php                                              |    2 +-
 ingo/spam.php                                                     |    2 +-
 ingo/vacation.php                                                 |    2 +-
 ingo/whitelist.php                                                |    2 +-
 jonah/LICENSE                                                     |    2 +-
 jonah/channels/delete.php                                         |    2 +-
 jonah/channels/edit.php                                           |    2 +-
 jonah/channels/index.php                                          |    2 +-
 jonah/delivery/html.php                                           |    2 +-
 jonah/delivery/index.php                                          |    2 +-
 jonah/delivery/rss.php                                            |    2 +-
 jonah/dispatcher.php                                              |    2 +-
 jonah/feed.php                                                    |    2 +-
 jonah/index.php                                                   |    2 +-
 jonah/lib/Api.php                                                 |    2 +-
 jonah/lib/Block/Cloud.php                                         |    2 +-
 jonah/lib/Block/Delivery.php                                      |    2 +-
 jonah/lib/Block/News.php                                          |    2 +-
 jonah/lib/Block/NewsPopular.php                                   |    2 +-
 jonah/lib/Driver.php                                              |    2 +-
 jonah/lib/Driver/Sql.php                                          |    2 +-
 jonah/lib/Exception.php                                           |    2 +-
 jonah/lib/Factory/Driver.php                                      |    2 +-
 jonah/lib/FeedParser.php                                          |    2 +-
 jonah/lib/Form/Feed.php                                           |    2 +-
 jonah/lib/Form/Story.php                                          |    2 +-
 jonah/lib/Jonah.php                                               |    2 +-
 jonah/lib/Test.php                                                |    2 +-
 jonah/lib/View/Base.php                                           |    2 +-
 jonah/lib/View/ChannelDelete.php                                  |    2 +-
 jonah/lib/View/ChannelEdit.php                                    |    2 +-
 jonah/lib/View/ChannelList.php                                    |    2 +-
 jonah/lib/View/DeliveryHtml.php                                   |    2 +-
 jonah/lib/View/StoryDelete.php                                    |    2 +-
 jonah/lib/View/StoryEdit.php                                      |    2 +-
 jonah/lib/View/StoryList.php                                      |    2 +-
 jonah/lib/View/StoryPdf.php                                       |    2 +-
 jonah/lib/View/StoryView.php                                      |    2 +-
 jonah/lib/View/TagSearchList.php                                  |    2 +-
 jonah/locale/de/LC_MESSAGES/jonah.po                              |    2 +-
 jonah/locale/es/LC_MESSAGES/jonah.po                              |    2 +-
 jonah/locale/fr/LC_MESSAGES/jonah.po                              |    2 +-
 jonah/locale/lv/LC_MESSAGES/jonah.po                              |    2 +-
 jonah/locale/nl/LC_MESSAGES/jonah.po                              |    2 +-
 jonah/locale/ro/LC_MESSAGES/jonah.po                              |    2 +-
 jonah/locale/tr/LC_MESSAGES/jonah.po                              |    2 +-
 jonah/locale/zh_TW/LC_MESSAGES/jonah.po                           |    2 +-
 jonah/migration/1_jonah_base_tables.php                           |    2 +-
 jonah/migration/2_jonah_upgrade_autoincrement.php                 |    2 +-
 jonah/stories/delete.php                                          |    2 +-
 jonah/stories/edit.php                                            |    2 +-
 jonah/stories/index.php                                           |    2 +-
 jonah/stories/pdf.php                                             |    2 +-
 jonah/stories/results.php                                         |    2 +-
 jonah/stories/share.php                                           |    2 +-
 jonah/stories/view.php                                            |    2 +-
 klutz/backend.php                                                 |    2 +-
 klutz/comics.php                                                  |    2 +-
 klutz/index.php                                                   |    2 +-
 klutz/lib/Klutz.php                                               |    2 +-
 klutz/locale/da/LC_MESSAGES/klutz.po                              |    2 +-
 klutz/locale/de/LC_MESSAGES/klutz.po                              |    2 +-
 klutz/locale/es/LC_MESSAGES/klutz.po                              |    2 +-
 klutz/locale/lv/LC_MESSAGES/klutz.po                              |    2 +-
 klutz/locale/ro/LC_MESSAGES/klutz.po                              |    2 +-
 klutz/locale/sv/LC_MESSAGES/klutz.po                              |    2 +-
 klutz/migration/1_klutz_base_tables.php                           |    2 +-
 klutz/savecomic.php                                               |    2 +-
 kolab/index.php                                                   |    2 +-
 kolab/lib/Api.php                                                 |    2 +-
 kolab/lib/Application.php                                         |    2 +-
 kolab/lib/Driver.php                                              |    2 +-
 kolab/lib/Driver/Sql.php                                          |    2 +-
 kolab/lib/Exception.php                                           |    2 +-
 kolab/lib/Factory/Driver.php                                      |    2 +-
 kolab/lib/Test.php                                                |    2 +-
 kolab/locale/fi/LC_MESSAGES/kolab.po                              |    2 +-
 koward/lib/Koward.php                                             |    2 +-
 koward/lib/Koward/Cli.php                                         |    2 +-
 koward/lib/Koward/Exception.php                                   |    2 +-
 koward/lib/Koward/Test.php                                        |    2 +-
 koward/lib/Koward/Test/AllTests.php                               |    2 +-
 koward/lib/Koward/Test/Server/UserTest.php                        |    2 +-
 koward/test/Koward/KowardTest.php                                 |    2 +-
 kronolith/add.php                                                 |    2 +-
 kronolith/attend.php                                              |    2 +-
 kronolith/bin/kronolith-agenda                                    |    2 +-
 kronolith/bin/kronolith-import-icals                              |    2 +-
 kronolith/bin/kronolith-import-squirrelmail-calendar              |    2 +-
 kronolith/calendars/create.php                                    |    2 +-
 kronolith/calendars/delete.php                                    |    2 +-
 kronolith/calendars/edit.php                                      |    2 +-
 kronolith/calendars/remote_edit.php                               |    2 +-
 kronolith/calendars/remote_subscribe.php                          |    2 +-
 kronolith/calendars/remote_unsubscribe.php                        |    2 +-
 kronolith/calendars/subscribe.php                                 |    2 +-
 kronolith/contacts.php                                            |    2 +-
 kronolith/data.php                                                |    2 +-
 kronolith/day.php                                                 |    2 +-
 kronolith/delete.php                                              |    2 +-
 kronolith/edit.php                                                |    2 +-
 kronolith/event.php                                               |    2 +-
 kronolith/fb.php                                                  |    2 +-
 kronolith/feed/index.php                                          |    2 +-
 kronolith/index.php                                               |    2 +-
 kronolith/js/dragdrop2.js                                         |    2 +-
 kronolith/js/edit.js                                              |    2 +-
 kronolith/js/goto.js                                              |    2 +-
 kronolith/js/kronolith.js                                         |    2 +-
 kronolith/js/smartmobile.js                                       |    2 +-
 kronolith/lib/Ajax.php                                            |    2 +-
 kronolith/lib/Ajax/Application.php                                |    2 +-
 kronolith/lib/Ajax/Application/Handler.php                        |    2 +-
 kronolith/lib/Ajax/Imple/ContactAutoCompleter.php                 |    2 +-
 kronolith/lib/Ajax/Imple/ResourceAutoCompleter.php                |    2 +-
 kronolith/lib/Ajax/Imple/TagActions.php                           |    2 +-
 kronolith/lib/Ajax/Imple/TagAutoCompleter.php                     |    2 +-
 kronolith/lib/Application.php                                     |    2 +-
 kronolith/lib/Calendar.php                                        |    2 +-
 kronolith/lib/Calendar/External.php                               |    2 +-
 kronolith/lib/Calendar/External/Tasks.php                         |    2 +-
 kronolith/lib/Calendar/Holiday.php                                |    2 +-
 kronolith/lib/Calendar/Internal.php                               |    2 +-
 kronolith/lib/Calendar/Remote.php                                 |    2 +-
 kronolith/lib/Calendar/Resource.php                               |    2 +-
 kronolith/lib/Calendar/ResourceGroup.php                          |    2 +-
 kronolith/lib/Driver.php                                          |    2 +-
 kronolith/lib/Driver/Holidays.php                                 |    2 +-
 kronolith/lib/Driver/Horde.php                                    |    2 +-
 kronolith/lib/Driver/Ical.php                                     |    2 +-
 kronolith/lib/Driver/Kolab.php                                    |    2 +-
 kronolith/lib/Driver/Mock.php                                     |    2 +-
 kronolith/lib/Driver/Resource/Sql.php                             |    2 +-
 kronolith/lib/Driver/Sql.php                                      |    2 +-
 kronolith/lib/Event.php                                           |    2 +-
 kronolith/lib/Event/Holidays.php                                  |    2 +-
 kronolith/lib/Event/Horde.php                                     |    2 +-
 kronolith/lib/Event/Ical.php                                      |    2 +-
 kronolith/lib/Event/Kolab.php                                     |    2 +-
 kronolith/lib/Event/Resource/Sql.php                              |    2 +-
 kronolith/lib/Event/Sql.php                                       |    2 +-
 kronolith/lib/Exception.php                                       |    2 +-
 kronolith/lib/Form/Type/KronolithTags.php                         |    2 +-
 kronolith/lib/FreeBusy/View.php                                   |    2 +-
 kronolith/lib/FreeBusy/View/Day.php                               |    2 +-
 kronolith/lib/FreeBusy/View/Month.php                             |    2 +-
 kronolith/lib/FreeBusy/View/Week.php                              |    2 +-
 kronolith/lib/FreeBusy/View/Workweek.php                          |    2 +-
 kronolith/lib/Geo/Base.php                                        |    2 +-
 kronolith/lib/Geo/Mysql.php                                       |    2 +-
 kronolith/lib/Geo/Sql.php                                         |    2 +-
 kronolith/lib/Kronolith.php                                       |    2 +-
 kronolith/lib/LoginTasks/SystemTask/Upgrade.php                   |    2 +-
 kronolith/lib/LoginTasks/Task/PurgeEvents.php                     |    2 +-
 kronolith/lib/Prefs/Special/DefaultAlarm.php                      |    2 +-
 kronolith/lib/Prefs/Special/EventAlarms.php                       |    2 +-
 kronolith/lib/Prefs/Special/Sourceselect.php                      |    2 +-
 kronolith/lib/Resource.php                                        |    2 +-
 kronolith/lib/Resource/Base.php                                   |    2 +-
 kronolith/lib/Resource/Group.php                                  |    2 +-
 kronolith/lib/Resource/Single.php                                 |    2 +-
 kronolith/lib/Storage/Kolab.php                                   |    2 +-
 kronolith/lib/Tagger.php                                          |    2 +-
 kronolith/lib/Test.php                                            |    2 +-
 kronolith/lib/View/Sidebar.php                                    |    2 +-
 kronolith/lib/View/SidebarTasks.php                               |    2 +-
 kronolith/locale/bg/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/ca/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/cs/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/da/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/de/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/es/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/hr/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/hu/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/ja/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/lt/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/lv/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/nb/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/nl/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/pl/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/pt_BR/LC_MESSAGES/kronolith.po                   |    2 +-
 kronolith/locale/ro/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/sl/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/tr/LC_MESSAGES/kronolith.po                      |    2 +-
 kronolith/locale/zh_CN/LC_MESSAGES/kronolith.po                   |    2 +-
 kronolith/migration/10_kronolith_upgrade_exceptions.php           |    2 +-
 kronolith/migration/11_kronolith_upgrade_resourceemail.php        |    2 +-
 kronolith/migration/12_kronolith_upgrade_addzoom.php              |    2 +-
 kronolith/migration/13_kronolith_upgrade_systemshares.php         |    2 +-
 kronolith/migration/14_kronolith_upgrade_missingresourcefield.php |    2 +-
 kronolith/migration/15_kronolith_upgrade_sqlng.php                |    2 +-
 kronolith/migration/16_kronolith_upgrade_sqlhierarchical.php      |    2 +-
 kronolith/migration/17_kronolith_upgrade_sqlnghierarchical.php    |    2 +-
 kronolith/migration/18_kronolith_upgrade_categoriestotags.php     |    2 +-
 kronolith/migration/19_kronolith_upgrade_addmysqlgeo.php          |    2 +-
 kronolith/migration/1_kronolith_base_tables.php                   |    2 +-
 kronolith/migration/20_kronolith_upgrade_timezone.php             |    2 +-
 kronolith/migration/21_kronolith_upgrade_exceptionutc.php         |    2 +-
 kronolith/migration/2_kronolith_upgrade_autoincrement.php         |    2 +-
 kronolith/migration/3_kronolith_upgrade_addallday.php             |    2 +-
 kronolith/migration/4_kronolith_upgrade_addalarmmethods.php       |    2 +-
 kronolith/migration/5_kronolith_upgrade_addcolor.php              |    2 +-
 kronolith/migration/6_kronolith_upgrade_addresources.php          |    2 +-
 kronolith/migration/7_kronolith_upgrade_resourceautoincrement.php |    2 +-
 kronolith/migration/8_kronolith_upgrade_addgeo.php                |    2 +-
 kronolith/migration/9_kronolith_upgrade_addurl.php                |    2 +-
 kronolith/month.php                                               |    2 +-
 kronolith/new.php                                                 |    2 +-
 kronolith/perms.php                                               |    2 +-
 kronolith/resources/create.php                                    |    2 +-
 kronolith/resources/delete.php                                    |    2 +-
 kronolith/resources/edit.php                                      |    2 +-
 kronolith/resources/groups/create.php                             |    2 +-
 kronolith/resources/groups/delete.php                             |    2 +-
 kronolith/resources/groups/edit.php                               |    2 +-
 kronolith/search.php                                              |    2 +-
 kronolith/smartmobile.php                                         |    2 +-
 kronolith/test/Kronolith/Integration/AllDayTest.php               |    2 +-
 kronolith/test/Kronolith/Integration/Driver/Base.php              |    2 +-
 kronolith/test/Kronolith/Integration/Driver/KolabTest.php         |    2 +-
 kronolith/test/Kronolith/Integration/Driver/Sql/Base.php          |    2 +-
 .../test/Kronolith/Integration/Driver/Sql/Pdo/SqliteTest.php      |    2 +-
 kronolith/test/Kronolith/Integration/FromIcalendarTest.php        |    2 +-
 kronolith/test/Kronolith/Integration/Kronolith/Base.php           |    2 +-
 kronolith/test/Kronolith/Integration/Kronolith/KolabTest.php      |    2 +-
 kronolith/test/Kronolith/Integration/Kronolith/Sql/Base.php       |    2 +-
 .../test/Kronolith/Integration/Kronolith/Sql/Pdo/SqliteTest.php   |    2 +-
 kronolith/test/Kronolith/Integration/ToIcalendarTest.php          |    2 +-
 kronolith/test/Kronolith/TestCase.php                             |    2 +-
 kronolith/view.php                                                |    2 +-
 kronolith/week.php                                                |    2 +-
 kronolith/workweek.php                                            |    2 +-
 kronolith/year.php                                                |    2 +-
 luxor/bin/luxor-indexer                                           |    2 +-
 luxor/index.php                                                   |    2 +-
 luxor/locale/de/LC_MESSAGES/luxor.po                              |    2 +-
 luxor/locale/es/LC_MESSAGES/luxor.po                              |    2 +-
 luxor/locale/fi/LC_MESSAGES/luxor.po                              |    2 +-
 luxor/locale/lv/LC_MESSAGES/luxor.po                              |    2 +-
 luxor/locale/ro/LC_MESSAGES/luxor.po                              |    2 +-
 luxor/search.php                                                  |    2 +-
 luxor/source.php                                                  |    2 +-
 luxor/symbol.php                                                  |    2 +-
 mnemo/LICENSE                                                     |    2 +-
 mnemo/bin/mnemo-convert-to-utf8                                   |    2 +-
 mnemo/bin/mnemo-import-text-note                                  |    2 +-
 mnemo/data.php                                                    |    2 +-
 mnemo/index.php                                                   |    2 +-
 mnemo/lib/Ajax/Application.php                                    |    2 +-
 mnemo/lib/Ajax/Imple/EditNote.php                                 |    2 +-
 mnemo/lib/Api.php                                                 |    2 +-
 mnemo/lib/Application.php                                         |    2 +-
 mnemo/lib/Block/Note.php                                          |    2 +-
 mnemo/lib/Driver.php                                              |    2 +-
 mnemo/lib/Driver/Kolab.php                                        |    2 +-
 mnemo/lib/Driver/Sql.php                                          |    2 +-
 mnemo/lib/Exception.php                                           |    2 +-
 mnemo/lib/Factory/Driver.php                                      |    2 +-
 mnemo/lib/Factory/Notepads.php                                    |    2 +-
 mnemo/lib/Mnemo.php                                               |    2 +-
 mnemo/lib/Notepads/Base.php                                       |    2 +-
 mnemo/lib/Notepads/Default.php                                    |    2 +-
 mnemo/lib/Notepads/Kolab.php                                      |    2 +-
 mnemo/list.php                                                    |    2 +-
 mnemo/locale/bg/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/cs/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/da/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/de/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/es/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/et/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/hr/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/hu/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/it/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/ja/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/lt/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/lv/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/nb/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/pl/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/pt_BR/LC_MESSAGES/mnemo.po                           |    2 +-
 mnemo/locale/ro/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/sl/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/sv/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/locale/tr/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/memo.php                                                    |    2 +-
 mnemo/migration/1_mnemo_base_tables.php                           |    2 +-
 mnemo/migration/2_mnemo_upgrade_autoincrement.php                 |    2 +-
 mnemo/migration/3_mnemo_upgrade_sqlng.php                         |    2 +-
 mnemo/migration/4_mnemo_upgrade_sqlhierarchical.php               |    4 +-
 mnemo/migration/5_mnemo_upgrade_sqlnghierarchical.php             |    4 +-
 mnemo/note/pdf.php                                                |    2 +-
 mnemo/notepads/create.php                                         |    2 +-
 mnemo/notepads/delete.php                                         |    2 +-
 mnemo/notepads/edit.php                                           |    2 +-
 mnemo/notes/index.php                                             |    2 +-
 mnemo/search.php                                                  |    2 +-
 mnemo/test/Mnemo/TestCase.php                                     |    2 +-
 mnemo/test/Mnemo/Unit/Driver/KolabTest.php                        |    2 +-
 mnemo/test/Mnemo/Unit/Factory/DriverTest.php                      |    2 +-
 mnemo/test/Mnemo/Unit/Mnemo/Base.php                              |    2 +-
 mnemo/test/Mnemo/Unit/Mnemo/KolabTest.php                         |    2 +-
 mnemo/test/Mnemo/Unit/Mnemo/Sql/Base.php                          |    2 +-
 mnemo/test/Mnemo/Unit/Mnemo/Sql/Pdo/SqliteTest.php                |    2 +-
 mnemo/view.php                                                    |    2 +-
 nag/bin/nag-create-missing-add-histories-sql                      |    2 +-
 nag/bin/nag-import-vtodos                                         |    2 +-
 nag/data.php                                                      |    2 +-
 nag/index.php                                                     |    2 +-
 nag/js/calendar.js                                                |    2 +-
 nag/js/smartmobile.js                                             |    2 +-
 nag/lib/Ajax/Application.php                                      |    2 +-
 nag/lib/Ajax/Application/Handler/Smartmobile.php                  |    2 +-
 nag/lib/Ajax/Imple/TagAutoCompleter.php                           |    2 +-
 nag/lib/Driver/Kolab.php                                          |    2 +-
 nag/lib/Exception.php                                             |    2 +-
 nag/lib/Form/Type/NagSearchDue.php                                |    2 +-
 nag/lib/Form/Type/NagTags.php                                     |    2 +-
 nag/lib/LoginTasks/Task/PurgeCompleted.php                        |    2 +-
 nag/lib/Prefs/Special/TaskAlarms.php                              |    2 +-
 nag/lib/Search.php                                                |    4 +-
 nag/lib/Smartmobile.php                                           |    2 +-
 nag/lib/TagBrowser.php                                            |    4 +-
 nag/lib/Tagger.php                                                |    2 +-
 nag/lib/View/List.php                                             |    2 +-
 nag/list.php                                                      |    2 +-
 nag/locale/bg/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/ca/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/cs/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/da/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/de/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/es/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/hr/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/hu/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/id/LC_MESSAGES/nag.po                                  |   10 +-
 nag/locale/ja/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/lt/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/lv/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/nb/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/nl/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/pl/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/pt/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/pt_BR/LC_MESSAGES/nag.po                               |    2 +-
 nag/locale/ro/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/sl/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/tr/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/uk/LC_MESSAGES/nag.po                                  |    2 +-
 nag/migration/10_nag_upgrade_categoriestotags.php                 |    2 +-
 nag/migration/11_nag_upgrade_smartlists.php                       |    2 +-
 nag/migration/1_nag_base_tables.php                               |    2 +-
 nag/migration/2_nag_upgrade_autoincrement.php                     |    2 +-
 nag/migration/3_nag_upgrade_addalarmmethods.php                   |    2 +-
 nag/migration/4_nag_upgrade_addcolor.php                          |    2 +-
 nag/migration/5_nag_upgrade_systemshares.php                      |    2 +-
 nag/migration/6_nag_upgrade_sqlng.php                             |    2 +-
 nag/migration/7_nag_upgrade_sqlhierarchical.php                   |    2 +-
 nag/migration/8_nag_upgrade_sqlnghierarchical.php                 |    2 +-
 nag/migration/9_nag_upgrade_recurrence.php                        |    2 +-
 nag/search.php                                                    |    2 +-
 nag/smartmobile.php                                               |    2 +-
 nag/task.php                                                      |    2 +-
 nag/tasklists/create.php                                          |    2 +-
 nag/tasklists/delete.php                                          |    2 +-
 nag/tasklists/edit.php                                            |    2 +-
 nag/tasks/index.php                                               |    2 +-
 nag/test/Nag/TestCase.php                                         |    2 +-
 nag/test/Nag/Unit/Driver/Base.php                                 |    2 +-
 nag/test/Nag/Unit/Driver/KolabTest.php                            |    2 +-
 nag/test/Nag/Unit/Driver/Sql/Base.php                             |    2 +-
 nag/test/Nag/Unit/Driver/Sql/Pdo/SqliteTest.php                   |    2 +-
 nag/test/Nag/Unit/Factory/TasklistsTest.php                       |    2 +-
 nag/test/Nag/Unit/Form/Task/Base.php                              |    2 +-
 nag/test/Nag/Unit/Form/Task/KolabTest.php                         |    2 +-
 nag/test/Nag/Unit/Form/Task/Sql/Base.php                          |    2 +-
 nag/test/Nag/Unit/Form/Task/Sql/Pdo/SqliteTest.php                |    2 +-
 nag/test/Nag/Unit/Nag/Base.php                                    |    2 +-
 nag/test/Nag/Unit/Nag/KolabTest.php                               |    2 +-
 nag/test/Nag/Unit/Nag/Sql/Base.php                                |    2 +-
 nag/test/Nag/Unit/Nag/Sql/Pdo/SqliteTest.php                      |    2 +-
 nag/view.php                                                      |    2 +-
 operator/export.php                                               |    2 +-
 operator/graphgen.php                                             |    2 +-
 operator/index.php                                                |    2 +-
 operator/lib/Driver.php                                           |    2 +-
 operator/lib/Driver/asterisksql.php                               |    2 +-
 operator/lib/Operator.php                                         |    2 +-
 operator/lib/api.php                                              |    2 +-
 operator/search.php                                               |    2 +-
 operator/viewgraph.php                                            |    2 +-
 passwd/index.php                                                  |    2 +-
 passwd/lib/Application.php                                        |    2 +-
 passwd/lib/Driver.php                                             |    2 +-
 passwd/lib/Driver/Adsi.php                                        |    2 +-
 passwd/lib/Driver/Composite.php                                   |    2 +-
 passwd/lib/Driver/Expect.php                                      |    2 +-
 passwd/lib/Driver/Expectpecl.php                                  |    2 +-
 passwd/lib/Driver/Horde.php                                       |    2 +-
 passwd/lib/Driver/Http.php                                        |    2 +-
 passwd/lib/Driver/Kolab.php                                       |    2 +-
 passwd/lib/Driver/Ldap.php                                        |    2 +-
 passwd/lib/Driver/Pine.php                                        |    2 +-
 passwd/lib/Driver/Poppassd.php                                    |    2 +-
 passwd/lib/Driver/Procopen.php                                    |    2 +-
 passwd/lib/Driver/Pspasswd.php                                    |    2 +-
 passwd/lib/Driver/Servuftp.php                                    |    2 +-
 passwd/lib/Driver/Smbldap.php                                     |    2 +-
 passwd/lib/Driver/Smbpasswd.php                                   |    2 +-
 passwd/lib/Driver/Soap.php                                        |    2 +-
 passwd/lib/Driver/Sql.php                                         |    2 +-
 passwd/lib/Driver/Vmailmgr.php                                    |    2 +-
 passwd/lib/Driver/Vpopmail.php                                    |    2 +-
 passwd/lib/Exception.php                                          |    2 +-
 passwd/lib/Factory/Driver.php                                     |    2 +-
 passwd/lib/Passwd.php                                             |    2 +-
 passwd/lib/Test.php                                               |    2 +-
 passwd/locale/bg/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/cs/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/da/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/de/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/es/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/hr/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/hu/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/id/LC_MESSAGES/passwd.po                            |   10 +-
 passwd/locale/ja/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/lt/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/lv/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/pl/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/pt_BR/LC_MESSAGES/passwd.po                         |    2 +-
 passwd/locale/ro/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/ru/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/sl/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/locale/tr/LC_MESSAGES/passwd.po                            |    2 +-
 passwd/test/Passwd/Autoload.php                                   |    2 +-
 pastie/LICENSE                                                    |    2 +-
 pastie/index.php                                                  |    2 +-
 pastie/lib/Application.php                                        |    2 +-
 pastie/lib/Driver.php                                             |    2 +-
 pastie/lib/Driver/Rdo.php                                         |    2 +-
 pastie/lib/Driver/Sql.php                                         |    2 +-
 pastie/lib/Entity/PasteMapper.php                                 |    4 +-
 pastie/lib/Factory/Driver.php                                     |    2 +-
 pastie/lib/Test.php                                               |    2 +-
 pastie/migration/1_pastie_base_tables.php                         |    2 +-
 pastie/paste.php                                                  |    2 +-
 pastie/scripts/sql/pastie.sql                                     |    2 +-
 pastie/view.php                                                   |    2 +-
 sam/blacklist.php                                                 |    2 +-
 sam/index.php                                                     |    2 +-
 sam/lib/Application.php                                           |    2 +-
 sam/lib/Driver/Amavisd/Sql.php                                    |    2 +-
 sam/lib/Driver/Spamd/Base.php                                     |    2 +-
 sam/lib/Driver/Spamd/Ftp.php                                      |    2 +-
 sam/lib/Driver/Spamd/Ldap.php                                     |    2 +-
 sam/lib/Driver/Spamd/Sql.php                                      |    2 +-
 sam/lib/Exception.php                                             |    2 +-
 sam/lib/Factory/Driver.php                                        |    2 +-
 sam/lib/Form/Blacklist.php                                        |    2 +-
 sam/lib/Form/List.php                                             |    2 +-
 sam/lib/Form/Options.php                                          |    2 +-
 sam/lib/Form/Whitelist.php                                        |    2 +-
 sam/lib/Sam.php                                                   |    2 +-
 sam/locale/cs/LC_MESSAGES/sam.po                                  |    2 +-
 sam/locale/de/LC_MESSAGES/sam.po                                  |    2 +-
 sam/locale/es/LC_MESSAGES/sam.po                                  |    2 +-
 sam/locale/et/LC_MESSAGES/sam.po                                  |    2 +-
 sam/locale/it/LC_MESSAGES/sam.po                                  |    2 +-
 sam/locale/lv/LC_MESSAGES/sam.po                                  |    2 +-
 sam/locale/ro/LC_MESSAGES/sam.po                                  |    2 +-
 sam/migration/1_sam_base_tables.php                               |    2 +-
 sam/spam.php                                                      |    2 +-
 sam/whitelist.php                                                 |    2 +-
 sesha/admin.php                                                   |    2 +-
 sesha/bin/sesha-add-stock                                         |    2 +-
 sesha/index.php                                                   |    2 +-
 sesha/lib/Api.php                                                 |    2 +-
 sesha/lib/Application.php                                         |    2 +-
 sesha/lib/Driver.php                                              |    2 +-
 sesha/lib/Driver/Rdo.php                                          |    2 +-
 sesha/lib/Entity/CategoryMapper.php                               |    4 +-
 sesha/lib/Entity/PropertyMapper.php                               |    4 +-
 sesha/lib/Entity/StockMapper.php                                  |    4 +-
 sesha/lib/Entity/ValueMapper.php                                  |    4 +-
 sesha/lib/Exception.php                                           |    2 +-
 sesha/lib/Form/Category.php                                       |    2 +-
 sesha/lib/Form/CategoryDelete.php                                 |    2 +-
 sesha/lib/Form/CategoryList.php                                   |    2 +-
 sesha/lib/Form/Property.php                                       |    2 +-
 sesha/lib/Form/PropertyDelete.php                                 |    2 +-
 sesha/lib/Form/PropertyList.php                                   |    2 +-
 sesha/lib/Form/Search.php                                         |    2 +-
 sesha/lib/Form/Stock.php                                          |    2 +-
 sesha/lib/Form/Type/Client.php                                    |    2 +-
 sesha/lib/Sesha.php                                               |    2 +-
 sesha/lib/Ui/VarRenderer/Stockedit_Html.php                       |    2 +-
 sesha/lib/View/Base.php                                           |    4 +-
 sesha/lib/View/List.php                                           |    2 +-
 sesha/list.php                                                    |    2 +-
 sesha/locale/de/LC_MESSAGES/sesha.po                              |    2 +-
 sesha/locale/es/LC_MESSAGES/sesha.po                              |    2 +-
 sesha/locale/fi/LC_MESSAGES/sesha.po                              |    2 +-
 sesha/locale/lt/LC_MESSAGES/sesha.po                              |    2 +-
 sesha/locale/lv/LC_MESSAGES/sesha.po                              |    2 +-
 sesha/migration/1_sesha_base_tables.php                           |    2 +-
 sesha/migration/2_sesha_upgrade_autoincrement.php                 |    2 +-
 sesha/search.php                                                  |    2 +-
 sesha/stock.php                                                   |    2 +-
 sesha/test/Sesha/Autoload.php                                     |    2 +-
 shout/lib/Ajax/Application.php                                    |    2 +-
 shout/lib/Ajax/Application/Handler.php                            |    2 +-
 skeleton/LICENSE.ASL                                              |    2 +-
 skeleton/LICENSE.BSDL                                             |    2 +-
 skeleton/index.php                                                |    2 +-
 skeleton/lib/Ajax/Application.php                                 |    2 +-
 skeleton/lib/Api.php                                              |    2 +-
 skeleton/lib/Application.php                                      |    2 +-
 skeleton/lib/Driver.php                                           |    2 +-
 skeleton/lib/Driver/Sql.php                                       |    2 +-
 skeleton/lib/Exception.php                                        |    2 +-
 skeleton/lib/Factory/Driver.php                                   |    2 +-
 skeleton/lib/Test.php                                             |    2 +-
 skeleton/list.php                                                 |    2 +-
 skeleton/locale/fi/LC_MESSAGES/skeleton.po                        |    2 +-
 skeleton/migration/1_skeleton_base_tables.php                     |    2 +-
 timeobjects/docs/COPYING                                          |    2 +-
 timeobjects/lib/Driver.php                                        |    2 +-
 timeobjects/lib/Driver/Base.php                                   |    2 +-
 timeobjects/lib/Driver/FacebookEvents.php                         |    2 +-
 timeobjects/lib/Driver/Weather.php                                |    2 +-
 timeobjects/lib/Exception.php                                     |    2 +-
 timeobjects/locale/de/LC_MESSAGES/timeobjects.po                  |    2 +-
 timeobjects/locale/et/LC_MESSAGES/timeobjects.po                  |    2 +-
 timeobjects/locale/fi/LC_MESSAGES/timeobjects.po                  |    2 +-
 timeobjects/locale/hu/LC_MESSAGES/timeobjects.po                  |    2 +-
 timeobjects/locale/ja/LC_MESSAGES/timeobjects.po                  |    2 +-
 timeobjects/locale/lv/LC_MESSAGES/timeobjects.po                  |    8 +-
 timeobjects/locale/nl/LC_MESSAGES/timeobjects.po                  |    2 +-
 timeobjects/locale/pl/LC_MESSAGES/timeobjects.po                  |    2 +-
 timeobjects/locale/sv/LC_MESSAGES/timeobjects.po                  |    2 +-
 trean/LICENSE                                                     |    2 +-
 trean/add.php                                                     |    2 +-
 trean/bin/trean-backfill-crawler                                  |    2 +-
 trean/bin/trean-backfill-favicons                                 |    2 +-
 trean/bin/trean-backfill-remove-utm-params                        |    2 +-
 trean/bin/trean-url-checker                                       |    2 +-
 trean/browse.php                                                  |    2 +-
 trean/edit.php                                                    |    2 +-
 trean/favicon.php                                                 |    2 +-
 trean/index.php                                                   |    2 +-
 trean/lib/Ajax/Application.php                                    |    2 +-
 trean/lib/Ajax/Imple/TagAutoCompleter.php                         |    2 +-
 trean/lib/Api.php                                                 |    2 +-
 trean/lib/Application.php                                         |    2 +-
 trean/lib/Block/Bookmarks.php                                     |    2 +-
 trean/lib/Block/Mostclicked.php                                   |    2 +-
 trean/lib/Bookmarks.php                                           |    2 +-
 trean/lib/TagBrowser.php                                          |    2 +-
 trean/lib/Tagger.php                                              |    2 +-
 trean/lib/Trean.php                                               |    2 +-
 trean/lib/View/BookmarkList.php                                   |    2 +-
 trean/locale/de/LC_MESSAGES/trean.po                              |    2 +-
 trean/locale/es/LC_MESSAGES/trean.po                              |    2 +-
 trean/locale/fr/LC_MESSAGES/trean.po                              |    2 +-
 trean/locale/it/LC_MESSAGES/trean.po                              |    2 +-
 trean/locale/lv/LC_MESSAGES/trean.po                              |    2 +-
 trean/locale/nb/LC_MESSAGES/trean.po                              |    2 +-
 trean/locale/nl/LC_MESSAGES/trean.po                              |    2 +-
 trean/locale/pl/LC_MESSAGES/trean.po                              |    2 +-
 trean/locale/sl/LC_MESSAGES/trean.po                              |    2 +-
 trean/locale/tr/LC_MESSAGES/trean.po                              |    2 +-
 trean/migration/1_trean_base_tables.php                           |    2 +-
 trean/migration/2_trean_upgrade_folders_to_tags_pre.php           |    2 +-
 trean/migration/3_trean_upgrade_folders_to_tags.php               |    2 +-
 trean/migration/4_trean_upgrade_folders_to_tags_post.php          |    2 +-
 trean/migration/5_trean_add_favicon_url.php                       |    2 +-
 trean/redirect.php                                                |    2 +-
 trean/rss.php                                                     |    2 +-
 trean/search.php                                                  |    2 +-
 turba/LICENSE                                                     |    2 +-
 turba/add.php                                                     |    2 +-
 turba/addressbooks/create.php                                     |    2 +-
 turba/addressbooks/delete.php                                     |    2 +-
 turba/addressbooks/edit.php                                       |    2 +-
 turba/bin/turba-import-squirrelmail-file-abook                    |    2 +-
 turba/bin/turba-import-squirrelmail-sql-abook                     |    2 +-
 turba/bin/turba-import-vcards                                     |    2 +-
 turba/bin/turba-public-to-horde-share                             |    2 +-
 turba/browse.php                                                  |    2 +-
 turba/contact.php                                                 |    2 +-
 turba/data.php                                                    |    2 +-
 turba/delete.php                                                  |    2 +-
 turba/deletefile.php                                              |    2 +-
 turba/edit.php                                                    |    2 +-
 turba/index.php                                                   |    2 +-
 turba/js/columnprefs.js                                           |    2 +-
 turba/js/minisearch.js                                            |    2 +-
 turba/js/search.js                                                |    2 +-
 turba/js/smartmobile.js                                           |    2 +-
 turba/lib/Ajax/Application.php                                    |    2 +-
 turba/lib/Ajax/Application/Handler/Minisearch.php                 |    2 +-
 turba/lib/Ajax/Application/Handler/Smartmobile.php                |    2 +-
 turba/lib/Api.php                                                 |    2 +-
 turba/lib/Application.php                                         |    2 +-
 turba/lib/Block/Minisearch.php                                    |    2 +-
 turba/lib/Data/Ldif.php                                           |    2 +-
 turba/lib/Driver.php                                              |    3 +-
 turba/lib/Driver/Facebook.php                                     |    2 +-
 turba/lib/Driver/Favourites.php                                   |    2 +-
 turba/lib/Driver/Group.php                                        |    2 +-
 turba/lib/Driver/Imsp.php                                         |    2 +-
 turba/lib/Driver/Kolab.php                                        |    2 +-
 turba/lib/Driver/Ldap.php                                         |    2 +-
 turba/lib/Driver/Prefs.php                                        |    2 +-
 turba/lib/Driver/Share.php                                        |    2 +-
 turba/lib/Driver/Sql.php                                          |    2 +-
 turba/lib/Driver/Vbook.php                                        |    2 +-
 turba/lib/Exception.php                                           |    2 +-
 turba/lib/Exception/ObjectExists.php                              |    2 +-
 turba/lib/Factory/Driver.php                                      |    2 +-
 turba/lib/List.php                                                |    2 +-
 turba/lib/LoginTasks/SystemTask/Upgrade.php                       |    2 +-
 turba/lib/Prefs/Special/Columnselect.php                          |    2 +-
 turba/lib/Smartmobile.php                                         |    2 +-
 turba/lib/Test.php                                                |    2 +-
 turba/lib/Turba.php                                               |    2 +-
 turba/lib/View/Browse.php                                         |    2 +-
 turba/lib/View/Duplicates.php                                     |    2 +-
 turba/lib/View/List.php                                           |    2 +-
 turba/locale/bg/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/ca/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/cs/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/da/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/de/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/es/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/hr/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/hu/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/is/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/ja/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/ko/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/lt/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/nb/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/pl/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/pt_BR/LC_MESSAGES/turba.po                           |    2 +-
 turba/locale/ro/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/sk/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/sl/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/tr/LC_MESSAGES/turba.po                              |    2 +-
 turba/merge.php                                                   |    2 +-
 turba/migration/1_turba_base_tables.php                           |    2 +-
 turba/migration/2_turba_upgrade_autoincrement.php                 |    2 +-
 turba/migration/3_turba_upgrade_sqlng.php                         |    2 +-
 turba/migration/4_turba_upgrade_sqlhierarchical.php               |    2 +-
 turba/migration/5_turba_upgrade_sqlnghierarchical.php             |    2 +-
 turba/migration/6_turba_upgrade_updateschema.php                  |    2 +-
 turba/search.php                                                  |    2 +-
 turba/smartmobile.php                                             |    2 +-
 turba/test/Turba/TestCase.php                                     |    2 +-
 turba/test/Turba/ToDo/ApiTest.php                                 |    2 +-
 turba/test/Turba/ToDo/KolabTestBase.php                           |    2 +-
 turba/test/Turba/Unit/Driver/Base.php                             |    2 +-
 turba/test/Turba/Unit/Driver/KolabTest.php                        |    2 +-
 turba/test/Turba/Unit/Driver/Sql/Base.php                         |    2 +-
 turba/test/Turba/Unit/Driver/Sql/Pdo/SqliteTest.php               |    2 +-
 turba/test/Turba/Unit/Turba/Base.php                              |    2 +-
 turba/test/Turba/Unit/Turba/KolabTest.php                         |    2 +-
 turba/test/Turba/Unit/Turba/Sql/Base.php                          |    2 +-
 turba/test/Turba/Unit/Turba/Sql/Pdo/SqliteTest.php                |    2 +-
 turba/vcard.php                                                   |    2 +-
 turba/view.php                                                    |    2 +-
 ulaform/delete.php                                                |    2 +-
 ulaform/deletefield.php                                           |    2 +-
 ulaform/display.php                                               |    2 +-
 ulaform/edit.php                                                  |    2 +-
 ulaform/fields.php                                                |    2 +-
 ulaform/forms.php                                                 |    2 +-
 ulaform/genhtml.php                                               |    2 +-
 ulaform/index.php                                                 |    2 +-
 ulaform/lib/Action.php                                            |    2 +-
 ulaform/lib/Action/Mailto.php                                     |    2 +-
 ulaform/lib/Action/Sql.php                                        |    2 +-
 ulaform/lib/Api.php                                               |    2 +-
 ulaform/lib/Application.php                                       |    2 +-
 ulaform/lib/Block/Form.php                                        |    2 +-
 ulaform/lib/Driver.php                                            |    2 +-
 ulaform/lib/Driver/Sql.php                                        |    2 +-
 ulaform/lib/Exception.php                                         |    2 +-
 ulaform/lib/Factory/Action.php                                    |    2 +-
 ulaform/lib/Factory/Driver.php                                    |    2 +-
 ulaform/lib/Test.php                                              |    2 +-
 ulaform/lib/Ulaform.php                                           |    2 +-
 ulaform/locale/de/LC_MESSAGES/ulaform.po                          |    2 +-
 ulaform/locale/es/LC_MESSAGES/ulaform.po                          |    2 +-
 ulaform/locale/it/LC_MESSAGES/ulaform.po                          |    2 +-
 ulaform/locale/lt/LC_MESSAGES/ulaform.po                          |    2 +-
 ulaform/locale/lv/LC_MESSAGES/ulaform.po                          |    2 +-
 ulaform/migration/1_ulaform_base_tables.php                       |    2 +-
 ulaform/migration/2_ulaform_upgrade_autoincrement.php             |    2 +-
 ulaform/migration/3_ulaform_upgrade_actions.php                   |    2 +-
 ulaform/sortfields.php                                            |    2 +-
 vilma/LICENSE                                                     |    2 +-
 vilma/domains/delete.php                                          |    2 +-
 vilma/domains/edit.php                                            |    2 +-
 vilma/domains/index.php                                           |    2 +-
 vilma/index.php                                                   |    2 +-
 vilma/lib/Driver.php                                              |    2 +-
 vilma/lib/Driver/Sql.php                                          |    2 +-
 vilma/lib/MailboxDriver.php                                       |    2 +-
 vilma/lib/MailboxDriver/Imap.php                                  |    2 +-
 vilma/lib/MailboxDriver/Maildrop.php                              |    2 +-
 vilma/lib/MailboxDriver/Null.php                                  |    2 +-
 vilma/lib/Test.php                                                |    2 +-
 vilma/lib/Vilma.php                                               |    2 +-
 vilma/locale/de/LC_MESSAGES/vilma.po                              |    2 +-
 vilma/locale/es/LC_MESSAGES/vilma.po                              |    2 +-
 vilma/locale/fi/LC_MESSAGES/vilma.po                              |    2 +-
 vilma/locale/it/LC_MESSAGES/vilma.po                              |    2 +-
 vilma/locale/lt/LC_MESSAGES/vilma.po                              |    2 +-
 vilma/locale/lv/LC_MESSAGES/vilma.po                              |    2 +-
 vilma/migration/1_vilma_base_tables.php                           |    2 +-
 vilma/migration/2_vilma_drop_domainkey.php                        |    2 +-
 vilma/users/delete.php                                            |    2 +-
 vilma/users/edit.php                                              |    2 +-
 vilma/users/editAlias.php                                         |    2 +-
 vilma/users/editForward.php                                       |    2 +-
 vilma/users/index.php                                             |    2 +-
 vilma/virtuals/delete.php                                         |    2 +-
 vilma/virtuals/edit.php                                           |    2 +-
 vilma/virtuals/index.php                                          |    2 +-
 whups/LICENSE                                                     |    2 +-
 whups/admin/index.php                                             |    2 +-
 whups/bin/whups-bugzilla-import                                   |    2 +-
 whups/bin/whups-convert-to-utf8                                   |    2 +-
 whups/bin/whups-obliterate                                        |    2 +-
 whups/bin/whups-reminders                                         |    2 +-
 whups/index.php                                                   |    2 +-
 whups/lib/Ajax/Imple/ContactAutoCompleter.php                     |    2 +-
 whups/lib/Application.php                                         |    2 +-
 whups/lib/Driver.php                                              |    2 +-
 whups/lib/Driver/Sql.php                                          |    2 +-
 whups/lib/Form/Action/whups_reload.php                            |    2 +-
 whups/lib/Form/AddListener.php                                    |    2 +-
 whups/lib/Form/Admin/AddAttribute.php                             |    2 +-
 whups/lib/Form/Admin/AddPriority.php                              |    2 +-
 whups/lib/Form/Admin/AddQueue.php                                 |    2 +-
 whups/lib/Form/Admin/AddReply.php                                 |    2 +-
 whups/lib/Form/Admin/AddState.php                                 |    2 +-
 whups/lib/Form/Admin/AddType.php                                  |    2 +-
 whups/lib/Form/Admin/AddUser.php                                  |    2 +-
 whups/lib/Form/Admin/AddVersion.php                               |    2 +-
 whups/lib/Form/Admin/CloneType.php                                |    2 +-
 whups/lib/Form/Admin/DefaultPriority.php                          |    2 +-
 whups/lib/Form/Admin/DefaultState.php                             |    2 +-
 whups/lib/Form/Admin/DeleteAttribute.php                          |    2 +-
 whups/lib/Form/Admin/DeletePriority.php                           |    2 +-
 whups/lib/Form/Admin/DeleteQueue.php                              |    2 +-
 whups/lib/Form/Admin/DeleteReply.php                              |    2 +-
 whups/lib/Form/Admin/DeleteState.php                              |    2 +-
 whups/lib/Form/Admin/DeleteType.php                               |    2 +-
 whups/lib/Form/Admin/DeleteVersion.php                            |    2 +-
 whups/lib/Form/Admin/EditAttributeStepOne.php                     |    2 +-
 whups/lib/Form/Admin/EditAttributeStepTwo.php                     |    2 +-
 whups/lib/Form/Admin/EditPriorityStepOne.php                      |    2 +-
 whups/lib/Form/Admin/EditPriorityStepTwo.php                      |    2 +-
 whups/lib/Form/Admin/EditQueueStepOne.php                         |    2 +-
 whups/lib/Form/Admin/EditQueueStepTwo.php                         |    2 +-
 whups/lib/Form/Admin/EditReplyStepOne.php                         |    2 +-
 whups/lib/Form/Admin/EditReplyStepTwo.php                         |    2 +-
 whups/lib/Form/Admin/EditStateStepOne.php                         |    2 +-
 whups/lib/Form/Admin/EditStateStepTwo.php                         |    2 +-
 whups/lib/Form/Admin/EditTypeStepOne.php                          |    2 +-
 whups/lib/Form/Admin/EditTypeStepTwo.php                          |    2 +-
 whups/lib/Form/Admin/EditUser.php                                 |    2 +-
 whups/lib/Form/Admin/EditVersionStepOne.php                       |    2 +-
 whups/lib/Form/Admin/EditVersionStepTwo.php                       |    2 +-
 whups/lib/Form/DeleteListener.php                                 |    2 +-
 whups/lib/Form/InsertBranch.php                                   |    2 +-
 whups/lib/Form/Query/Parameter.php                                |    2 +-
 whups/lib/Form/Query/UserCriterion.php                            |    2 +-
 whups/lib/Form/Queue/StepOne.php                                  |    2 +-
 whups/lib/Form/Queue/StepThree.php                                |    2 +-
 whups/lib/Form/Queue/StepTwo.php                                  |    2 +-
 whups/lib/Form/Renderer/Comment.php                               |    2 +-
 whups/lib/Form/Renderer/Query.php                                 |    2 +-
 whups/lib/Form/SendReminder.php                                   |    2 +-
 whups/lib/Form/SetTypeStepOne.php                                 |    2 +-
 whups/lib/Form/SetTypeStepTwo.php                                 |    2 +-
 whups/lib/Form/Ticket/CreateStepFour.php                          |    2 +-
 whups/lib/Form/Ticket/CreateStepOne.php                           |    2 +-
 whups/lib/Form/Ticket/CreateStepThree.php                         |    2 +-
 whups/lib/Form/Ticket/CreateStepTwo.php                           |    2 +-
 whups/lib/Form/Ticket/Delete.php                                  |    2 +-
 whups/lib/LoginTasks/SystemTask/Upgrade.php                       |    2 +-
 whups/lib/Mail.php                                                |    2 +-
 whups/lib/Mime/Viewer/Zip.php                                     |    2 +-
 whups/lib/Prefs/Special/Sourceselect.php                          |    2 +-
 whups/lib/Query.php                                               |    2 +-
 whups/lib/Query/Manager.php                                       |    2 +-
 whups/lib/Reports.php                                             |    2 +-
 whups/lib/Ticket.php                                              |    2 +-
 whups/lib/Ui/VarRenderer/Whups.php                                |    2 +-
 whups/lib/View/Base.php                                           |    2 +-
 whups/lib/View/Results.php                                        |    2 +-
 whups/lib/View/SavedQueries.php                                   |    2 +-
 whups/lib/Whups.php                                               |    2 +-
 whups/lib/tests/ApiTest.php                                       |    2 +-
 whups/lib/tests/TestBase.php                                      |    2 +-
 whups/locale/bg/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/de/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/es/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/hu/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/it/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/lt/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/lv/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/nb/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/nl/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/pl/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/pt_BR/LC_MESSAGES/whups.po                           |    2 +-
 whups/locale/ro/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/sl/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/tr/LC_MESSAGES/whups.po                              |    2 +-
 whups/locale/uk/LC_MESSAGES/whups.po                              |    2 +-
 whups/migration/1_whups_base_tables.php                           |    2 +-
 whups/migration/2_whups_autoincrement_shares.php                  |    2 +-
 whups/migration/3_whups_upgrade_sqlng.php                         |    2 +-
 whups/migration/4_whups_upgrade_sqlhierarchical.php               |    2 +-
 whups/migration/5_whups_upgrade_sqlnghierarchical.php             |    2 +-
 whups/migration/6_whups_upgrade_transactions.php                  |    2 +-
 whups/migration/7_whups_upgrade_autoincrement.php                 |    2 +-
 whups/migration/8_whups_add_attribute_index.php                   |    2 +-
 whups/mybugs.php                                                  |    2 +-
 whups/mybugs_edit.php                                             |    2 +-
 whups/opensearch.php                                              |    2 +-
 whups/query/index.php                                             |    2 +-
 whups/query/rss.php                                               |    2 +-
 whups/query/run.php                                               |    2 +-
 whups/queue/index.php                                             |    2 +-
 whups/queue/rss.php                                               |    2 +-
 whups/reports.php                                                 |    2 +-
 whups/search.php                                                  |    2 +-
 whups/search/rss.php                                              |    2 +-
 whups/ticket/comment.php                                          |    2 +-
 whups/ticket/create.php                                           |    2 +-
 whups/ticket/delete.php                                           |    2 +-
 whups/ticket/delete_attachment.php                                |    2 +-
 whups/ticket/delete_history.php                                   |    2 +-
 whups/ticket/index.php                                            |    2 +-
 whups/ticket/queue.php                                            |    2 +-
 whups/ticket/rss.php                                              |    2 +-
 whups/ticket/type.php                                             |    2 +-
 whups/ticket/update.php                                           |    2 +-
 whups/ticket/watch.php                                            |    2 +-
 whups/view.php                                                    |    2 +-
 wicked/bin/wicked-convert-to-utf8                                 |    2 +-
 wicked/diff.php                                                   |    2 +-
 wicked/display.php                                                |    2 +-
 wicked/history.php                                                |    2 +-
 wicked/index.php                                                  |    2 +-
 wicked/lib/Api.php                                                |    2 +-
 wicked/lib/Application.php                                        |    2 +-
 wicked/lib/Block/Page.php                                         |    2 +-
 wicked/lib/Driver.php                                             |    2 +-
 wicked/lib/Exception.php                                          |    2 +-
 wicked/lib/Factory/Driver.php                                     |    2 +-
 wicked/lib/Page.php                                               |    2 +-
 wicked/lib/Page/AddPage.php                                       |    2 +-
 wicked/lib/Page/AllPages.php                                      |    2 +-
 wicked/lib/Page/AttachedFiles.php                                 |    2 +-
 wicked/lib/Page/BackLinks.php                                     |    2 +-
 wicked/lib/Page/DeletePage.php                                    |    2 +-
 wicked/lib/Page/EditPage.php                                      |    2 +-
 wicked/lib/Page/LeastPopular.php                                  |    2 +-
 wicked/lib/Page/LikePages.php                                     |    2 +-
 wicked/lib/Page/MergeOrRename.php                                 |    2 +-
 wicked/lib/Page/MostPopular.php                                   |    2 +-
 wicked/lib/Page/NewPage.php                                       |    2 +-
 wicked/lib/Page/RecentChanges.php                                 |    2 +-
 wicked/lib/Page/RevertPage.php                                    |    2 +-
 wicked/lib/Page/Search.php                                        |    2 +-
 wicked/lib/Page/StandardPage.php                                  |    2 +-
 wicked/lib/Page/SyncDiff.php                                      |    2 +-
 wicked/lib/Page/SyncPages.php                                     |    2 +-
 wicked/lib/Sync.php                                               |    2 +-
 wicked/lib/Sync/Wicked.php                                        |    2 +-
 wicked/lib/Test.php                                               |    2 +-
 wicked/lib/Text_Wiki/Render/Rst.php                               |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Bold.php                          |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Code.php                          |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Deflist.php                       |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Freelink.php                      |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Heading.php                       |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Links.php                         |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/List.php                          |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Newline.php                       |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Paragraph.php                     |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Raw.php                           |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Toc.php                           |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Tt.php                            |    2 +-
 wicked/lib/Text_Wiki/Render/Rst/Url.php                           |    2 +-
 wicked/lib/Wicked.php                                             |    2 +-
 wicked/locale/de/LC_MESSAGES/wicked.po                            |    2 +-
 wicked/locale/es/LC_MESSAGES/wicked.po                            |    2 +-
 wicked/locale/it/LC_MESSAGES/wicked.po                            |    2 +-
 wicked/locale/ja/LC_MESSAGES/wicked.po                            |    2 +-
 wicked/locale/lv/LC_MESSAGES/wicked.po                            |    2 +-
 wicked/locale/pt_BR/LC_MESSAGES/wicked.po                         |    2 +-
 wicked/locale/sk/LC_MESSAGES/wicked.po                            |    2 +-
 wicked/locale/sl/LC_MESSAGES/wicked.po                            |    2 +-
 wicked/locale/uk/LC_MESSAGES/wicked.po                            |    2 +-
 wicked/locale/zh_TW/LC_MESSAGES/wicked.po                         |    2 +-
 wicked/migration/1_wicked_base_tables.php                         |    2 +-
 wicked/migration/2_wicked_autoincrement_page_id.php               |    2 +-
 wicked/migration/3_wicked_unsigned_ints.php                       |    2 +-
 wicked/migration/4_wicked_single_revisions.php                    |    2 +-
 wicked/migration/5_wicked_rename_pages.php                        |    2 +-
 wicked/opensearch.php                                             |    2 +-
 wicked/preview.php                                                |    2 +-
 wicked/test/Wicked/Autoload.php                                   |    2 +-
 wicked/test/Wicked/TestCase.php                                   |    2 +-
 wicked/test/Wicked/Unit/Driver/SqlTest.php                        |    2 +-
 wicked/test/Wicked/Unit/RstTest.php                               |    2 +-
 5449 files changed, 6637 insertions(+), 6335 deletions(-)

http://git.horde.org/horde-git/-/commit/04033c3fe81ef1f1a387772cd8fc0b3b4a50b6bc

-----------------------------------------------------------------------

commit 5287c8dee15c868aed829c1a7503b8025ba24686
Merge: 04033c3 e2bb429
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 9 15:22:04 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Auth/package.xml |    4 ++--
 imp/lib/Minimal/Base.php   |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/5287c8dee15c868aed829c1a7503b8025ba24686

-----------------------------------------------------------------------

commit 9ca71521b22902db5c82174f10ddb93e05427005
Merge: 5287c8d 09100b0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Jan 10 14:43:23 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/Application.php
    	imp/package.xml

 ansel/browse.php                                      |    2 +-
 ansel/lib/Application.php                             |   33 ++-
 ansel/package.xml                                     |    8 +-
 ansel/templates/browse/new.inc                        |    3 +
 bundles/groupware/docs/CHANGES                        |  186 ++++++++++++++-
 bundles/groupware/docs/RELEASE_NOTES                  |   24 +-
 bundles/groupware/lib/Bundle.php                      |    2 +-
 bundles/groupware/package.xml                         |   33 ++-
 bundles/webmail/docs/CHANGES                          |  219 ++++++++++++++++-
 bundles/webmail/docs/RELEASE_NOTES                    |   45 ++--
 bundles/webmail/lib/Bundle.php                        |    2 +-
 bundles/webmail/package.xml                           |   37 ++-
 framework/ActiveSync/package.xml                      |    8 +-
 framework/Auth/package.xml                            |    4 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php   |    8 +-
 framework/Core/package.xml                            |   14 +-
 framework/Core/test/Horde/Core/ActiveSyncTests.php    |  131 ++++++++++
 framework/Date/test/Horde/Date/RecurrenceTest.php     |    3 +
 framework/Share/package.xml                           |   23 ++-
 framework/SpellChecker/package.xml                    |   27 ++-
 framework/SyncMl/package.xml                          |   23 ++-
 framework/Text_Filter/package.xml                     |   23 ++-
 framework/Token/package.xml                           |   23 ++-
 framework/Vfs/package.xml                             |   25 ++-
 gollem/docs/CHANGES                                   |    6 +
 gollem/docs/RELEASE_NOTES                             |   20 +-
 gollem/package.xml                                    |   30 ++-
 horde/admin/activesync.php                            |    6 +-
 horde/admin/alarms.php                                |    6 +-
 horde/admin/cmdshell.php                              |    6 +-
 horde/admin/config/config.php                         |    6 +-
 horde/admin/config/diff.php                           |    6 +-
 horde/admin/config/index.php                          |    6 +-
 horde/admin/config/scripts.php                        |    6 +-
 horde/admin/groups.php                                |    6 +-
 horde/admin/locks.php                                 |    6 +-
 horde/admin/perms/addchild.php                        |    6 +-
 horde/admin/perms/delete.php                          |    6 +-
 horde/admin/perms/edit.php                            |    6 +-
 horde/admin/perms/index.php                           |    6 +-
 horde/admin/phpshell.php                              |    6 +-
 horde/admin/sessions.php                              |    6 +-
 horde/admin/signup_confirm.php                        |    6 +-
 horde/admin/sqlshell.php                              |    6 +-
 horde/admin/user.php                                  |    6 +-
 horde/bin/horde-active-sessions                       |    6 +-
 horde/bin/horde-alarms                                |    6 +-
 horde/bin/horde-check-logger                          |    6 +-
 horde/bin/horde-clear-cache                           |    6 +-
 horde/bin/horde-crond                                 |    6 +-
 horde/bin/horde-db-migrate                            |    6 +-
 horde/bin/horde-import-squirrelmail-prefs             |    6 +-
 horde/bin/horde-memcache-stats                        |    6 +-
 horde/bin/horde-run-task                              |    6 +-
 horde/bin/horde-set-perms                             |    6 +-
 horde/bin/horde-themes                                |    6 +-
 horde/bin/horde-translation                           |    2 +-
 horde/docs/CHANGES                                    |    8 +-
 horde/docs/CODING_STANDARDS                           |    6 +-
 horde/docs/RELEASE_NOTES                              |   14 +-
 horde/index.php                                       |    6 +-
 horde/install/horde.php                               |    8 +-
 horde/js/activesyncadmin.js                           |    4 +-
 horde/js/activesyncprefs.js                           |    4 +-
 horde/js/categoryprefs.js                             |    4 +-
 horde/js/form_sections.js                             |    4 +-
 horde/js/ieescguard.js                                |    4 +-
 horde/js/logintasks-jquery.js                         |    4 +-
 horde/js/logintasks.js                                |    4 +-
 horde/js/sidebar.js                                   |    4 +-
 horde/js/stripe.js                                    |    4 +-
 horde/js/syncmlprefs.js                               |    4 +-
 horde/js/userupdate.js                                |    4 +-
 horde/js/vatid.js                                     |    4 +-
 horde/lib/Ajax/Application.php                        |    6 +-
 horde/lib/Ajax/Application/Handler.php                |    6 +-
 horde/lib/Application.php                             |    6 +-
 horde/lib/Block/Account.php                           |    4 +-
 horde/lib/Block/Account/Base.php                      |    4 +-
 horde/lib/Block/Account/Finger.php                    |    4 +-
 horde/lib/Block/Account/Ldap.php                      |    4 +-
 horde/lib/Block/Account/Localhost.php                 |    4 +-
 horde/lib/Block/TwitterTimeline.php                   |    4 +-
 horde/lib/LoginTasks/SystemTask/GarbageCollection.php |    6 +-
 horde/lib/LoginTasks/SystemTask/Upgrade.php           |    6 +-
 horde/lib/LoginTasks/Task/AdminCheck.php              |    6 +-
 horde/lib/LoginTasks/Task/LastLogin.php               |    6 +-
 horde/lib/Prefs/Special/Activesync.php                |    4 +-
 horde/lib/Prefs/Special/Category.php                  |    4 +-
 horde/lib/Prefs/Special/Facebook.php                  |    4 +-
 horde/lib/Prefs/Special/Syncml.php                    |    4 +-
 horde/lib/Prefs/Special/Twitter.php                   |    4 +-
 horde/lib/Test.php                                    |    6 +-
 horde/lib/Tree/Renderer/Menu.php                      |    6 +-
 horde/lib/Tree/Renderer/Sidebar.php                   |    6 +-
 horde/lib/View/Sidebar.php                            |    6 +-
 horde/lib/View/Topbar.php                             |    6 +-
 horde/lib/core.php                                    |    6 +-
 horde/login.php                                       |    6 +-
 horde/package.xml                                     |   93 ++++---
 horde/rampage.php                                     |    2 +-
 horde/rpc.php                                         |    6 +-
 horde/rpc/index.php                                   |    6 +-
 horde/scripts/cookie_login.php                        |    6 +-
 horde/scripts/get_login.php                           |    6 +-
 horde/scripts/http_login.php                          |    6 +-
 horde/services/ajax.php                               |    6 +-
 horde/services/cache.php                              |    6 +-
 horde/services/cacheview.php                          |    6 +-
 horde/services/changepassword.php                     |    6 +-
 horde/services/confirm.php                            |    6 +-
 horde/services/download/index.php                     |    6 +-
 horde/services/facebook/index.php                     |    6 +-
 horde/services/go.php                                 |    6 +-
 horde/services/help/index.php                         |    6 +-
 horde/services/images/pixel.php                       |    6 +-
 horde/services/images/view.php                        |    6 +-
 horde/services/language.php                           |    6 +-
 horde/services/logintasks.php                         |    6 +-
 horde/services/obrowser/index.php                     |    6 +-
 horde/services/portal/cloud_search.php                |    6 +-
 horde/services/portal/edit.php                        |    6 +-
 horde/services/portal/index.php                       |    6 +-
 horde/services/portal/smartmobile.php                 |    6 +-
 horde/services/prefs.php                              |    6 +-
 horde/services/problem.php                            |    6 +-
 horde/services/resetpassword.php                      |    6 +-
 horde/services/shares/edit.php                        |    6 +-
 horde/services/snooze.php                             |    6 +-
 horde/services/twitter/index.php                      |    6 +-
 horde/signup.php                                      |    6 +-
 horde/test.php                                        |    6 +-
 horde/util/barcode.php                                |    6 +-
 horde/util/icon_browser.php                           |    4 +-
 imp/docs/CHANGES                                      |   18 +-
 imp/docs/RELEASE_NOTES                                |   20 +-
 imp/package.xml                                       |    9 +-
 ingo/docs/CHANGES                                     |    8 +-
 ingo/docs/RELEASE_NOTES                               |   12 +-
 ingo/lib/Application.php                              |    2 +-
 ingo/package.xml                                      |   70 +++---
 kronolith/docs/CHANGES                                |    8 +-
 kronolith/docs/RELEASE_NOTES                          |   12 +-
 kronolith/lib/Application.php                         |    2 +-
 kronolith/package.xml                                 |   32 ++-
 mnemo/docs/CHANGES                                    |    8 +-
 mnemo/docs/RELEASE_NOTES                              |    8 +-
 mnemo/lib/Application.php                             |    2 +-
 mnemo/package.xml                                     |   34 ++--
 nag/docs/CHANGES                                      |    8 +-
 nag/docs/RELEASE_NOTES                                |   12 +-
 nag/lib/Application.php                               |    2 +-
 nag/package.xml                                       |   30 ++-
 sesha/docs/CHANGES                                    |    6 +
 sesha/docs/RELEASE_NOTES                              |    4 +-
 sesha/package.xml                                     |   23 ++-
 timeobjects/docs/CHANGES                              |    8 +-
 timeobjects/lib/Application.php                       |    2 +-
 timeobjects/package.xml                               |   31 ++-
 trean/docs/CHANGES                                    |   12 +-
 trean/docs/RELEASE_NOTES                              |   10 +-
 trean/package.xml                                     |   45 +++-
 turba/docs/CHANGES                                    |    8 +-
 turba/docs/RELEASE_NOTES                              |    6 +-
 turba/lib/Application.php                             |    2 +-
 turba/package.xml                                     |   26 ++-
 166 files changed, 1475 insertions(+), 652 deletions(-)

http://git.horde.org/horde-git/-/commit/9ca71521b22902db5c82174f10ddb93e05427005

-----------------------------------------------------------------------

commit 5d047d73008cadff9f5452f9cf48b85e2596d598
Merge: 9ca7152 040950d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 14 13:50:40 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 agora/locale/lv/LC_MESSAGES/agora.mo                              |  Bin 82890 -> 75116 bytes
 ansel/locale/lv/LC_MESSAGES/ansel.mo                              |  Bin 103167 -> 95269 bytes
 beatnik/locale/lv/LC_MESSAGES/beatnik.mo                          |  Bin 77147 -> 69284 bytes
 chora/locale/lv/LC_MESSAGES/chora.mo                              |  Bin 75872 -> 68028 bytes
 folks/locale/lv/LC_MESSAGES/folks.mo                              |  Bin 78613 -> 70758 bytes
 framework/Core/test/Horde/Core/ActiveSyncTests.php                |   22 +-
 framework/Date/lib/Horde/Date.php                                 |   10 +-
 framework/Editor/js/LICENSE.html                                  | 1327 --
 framework/Editor/js/ckeditor.js                                   |    1 -
 framework/Editor/js/ckeditor/LICENSE.html                         | 1327 ++
 framework/Editor/js/ckeditor/ckeditor.js                          |    1 +
 framework/Editor/js/ckeditor/ckeditor_basic.js                    |    1 +
 framework/Editor/js/ckeditor/config.js                            |    1 +
 framework/Editor/js/ckeditor/contents.css                         |   25 +
 framework/Editor/js/ckeditor/images/spacer.gif                    |  Bin 0 -> 43 bytes
 framework/Editor/js/ckeditor/lang/_languages.js                   |    1 +
 framework/Editor/js/ckeditor/lang/af.js                           |    1 +
 framework/Editor/js/ckeditor/lang/ar.js                           |    1 +
 framework/Editor/js/ckeditor/lang/bg.js                           |    1 +
 framework/Editor/js/ckeditor/lang/bn.js                           |    1 +
 framework/Editor/js/ckeditor/lang/bs.js                           |    1 +
 framework/Editor/js/ckeditor/lang/ca.js                           |    1 +
 framework/Editor/js/ckeditor/lang/cs.js                           |    1 +
 framework/Editor/js/ckeditor/lang/cy.js                           |    1 +
 framework/Editor/js/ckeditor/lang/da.js                           |    1 +
 framework/Editor/js/ckeditor/lang/de.js                           |    1 +
 framework/Editor/js/ckeditor/lang/el.js                           |    1 +
 framework/Editor/js/ckeditor/lang/en-au.js                        |    1 +
 framework/Editor/js/ckeditor/lang/en-ca.js                        |    1 +
 framework/Editor/js/ckeditor/lang/en-gb.js                        |    1 +
 framework/Editor/js/ckeditor/lang/en.js                           |    1 +
 framework/Editor/js/ckeditor/lang/eo.js                           |    1 +
 framework/Editor/js/ckeditor/lang/es.js                           |    1 +
 framework/Editor/js/ckeditor/lang/et.js                           |    1 +
 framework/Editor/js/ckeditor/lang/eu.js                           |    1 +
 framework/Editor/js/ckeditor/lang/fa.js                           |    1 +
 framework/Editor/js/ckeditor/lang/fi.js                           |    1 +
 framework/Editor/js/ckeditor/lang/fo.js                           |    1 +
 framework/Editor/js/ckeditor/lang/fr-ca.js                        |    1 +
 framework/Editor/js/ckeditor/lang/fr.js                           |    1 +
 framework/Editor/js/ckeditor/lang/gl.js                           |    1 +
 framework/Editor/js/ckeditor/lang/gu.js                           |    1 +
 framework/Editor/js/ckeditor/lang/he.js                           |    1 +
 framework/Editor/js/ckeditor/lang/hi.js                           |    1 +
 framework/Editor/js/ckeditor/lang/hr.js                           |    1 +
 framework/Editor/js/ckeditor/lang/hu.js                           |    1 +
 framework/Editor/js/ckeditor/lang/id.js                           |    1 +
 framework/Editor/js/ckeditor/lang/is.js                           |    1 +
 framework/Editor/js/ckeditor/lang/it.js                           |    1 +
 framework/Editor/js/ckeditor/lang/ja.js                           |    1 +
 framework/Editor/js/ckeditor/lang/ka.js                           |    1 +
 framework/Editor/js/ckeditor/lang/km.js                           |    1 +
 framework/Editor/js/ckeditor/lang/ko.js                           |    1 +
 framework/Editor/js/ckeditor/lang/ku.js                           |    1 +
 framework/Editor/js/ckeditor/lang/lt.js                           |    1 +
 framework/Editor/js/ckeditor/lang/lv.js                           |    1 +
 framework/Editor/js/ckeditor/lang/mk.js                           |    1 +
 framework/Editor/js/ckeditor/lang/mn.js                           |    1 +
 framework/Editor/js/ckeditor/lang/ms.js                           |    1 +
 framework/Editor/js/ckeditor/lang/nb.js                           |    1 +
 framework/Editor/js/ckeditor/lang/nl.js                           |    1 +
 framework/Editor/js/ckeditor/lang/no.js                           |    1 +
 framework/Editor/js/ckeditor/lang/pl.js                           |    1 +
 framework/Editor/js/ckeditor/lang/pt-br.js                        |    1 +
 framework/Editor/js/ckeditor/lang/pt.js                           |    1 +
 framework/Editor/js/ckeditor/lang/ro.js                           |    1 +
 framework/Editor/js/ckeditor/lang/ru.js                           |    1 +
 framework/Editor/js/ckeditor/lang/sk.js                           |    1 +
 framework/Editor/js/ckeditor/lang/sl.js                           |    1 +
 framework/Editor/js/ckeditor/lang/sr-latn.js                      |    1 +
 framework/Editor/js/ckeditor/lang/sr.js                           |    1 +
 framework/Editor/js/ckeditor/lang/sv.js                           |    1 +
 framework/Editor/js/ckeditor/lang/th.js                           |    1 +
 framework/Editor/js/ckeditor/lang/tr.js                           |    1 +
 framework/Editor/js/ckeditor/lang/ug.js                           |    1 +
 framework/Editor/js/ckeditor/lang/uk.js                           |    1 +
 framework/Editor/js/ckeditor/lang/vi.js                           |    1 +
 framework/Editor/js/ckeditor/lang/zh-cn.js                        |    1 +
 framework/Editor/js/ckeditor/lang/zh.js                           |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/cs.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/cy.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/da.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/de.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/el.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/en.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/eo.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/fa.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/fi.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/fr.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/gu.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/he.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/it.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/ku.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/mk.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/nb.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/nl.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/no.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/pt-br.js       |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/ro.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/sk.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/tr.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/ug.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/vi.js          |    1 +
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/zh-cn.js       |    1 +
 framework/Editor/js/ckeditor/plugins/about/dialogs/about.js       |    1 +
 .../Editor/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png    |  Bin 0 -> 2759 bytes
 framework/Editor/js/ckeditor/plugins/adobeair/plugin.js           |    1 +
 framework/Editor/js/ckeditor/plugins/ajax/plugin.js               |    1 +
 framework/Editor/js/ckeditor/plugins/autogrow/plugin.js           |    1 +
 framework/Editor/js/ckeditor/plugins/bbcode/plugin.js             |    1 +
 framework/Editor/js/ckeditor/plugins/clipboard/dialogs/paste.js   |    1 +
 .../Editor/js/ckeditor/plugins/colordialog/dialogs/colordialog.js |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/bg.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/cs.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/cy.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/da.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/de.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/el.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/en.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/eo.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/et.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/fa.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/fi.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/fr.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/gu.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/he.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/hr.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/it.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/ku.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/nb.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/nl.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/no.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/pl.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/pt-br.js       |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/sk.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/tr.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/ug.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/uk.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/vi.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/zh-cn.js       |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/plugin.js           |    1 +
 framework/Editor/js/ckeditor/plugins/div/dialogs/div.js           |    1 +
 framework/Editor/js/ckeditor/plugins/docprops/dialogs/docprops.js |    1 +
 framework/Editor/js/ckeditor/plugins/docprops/plugin.js           |    1 +
 framework/Editor/js/ckeditor/plugins/find/dialogs/find.js         |    1 +
 framework/Editor/js/ckeditor/plugins/flash/dialogs/flash.js       |    1 +
 framework/Editor/js/ckeditor/plugins/flash/images/placeholder.png |  Bin 0 -> 256 bytes
 framework/Editor/js/ckeditor/plugins/forms/dialogs/button.js      |    1 +
 framework/Editor/js/ckeditor/plugins/forms/dialogs/checkbox.js    |    1 +
 framework/Editor/js/ckeditor/plugins/forms/dialogs/form.js        |    1 +
 framework/Editor/js/ckeditor/plugins/forms/dialogs/hiddenfield.js |    1 +
 framework/Editor/js/ckeditor/plugins/forms/dialogs/radio.js       |    1 +
 framework/Editor/js/ckeditor/plugins/forms/dialogs/select.js      |    1 +
 framework/Editor/js/ckeditor/plugins/forms/dialogs/textarea.js    |    1 +
 framework/Editor/js/ckeditor/plugins/forms/dialogs/textfield.js   |    1 +
 framework/Editor/js/ckeditor/plugins/forms/images/hiddenfield.gif |  Bin 0 -> 105 bytes
 framework/Editor/js/ckeditor/plugins/iframe/dialogs/iframe.js     |    1 +
 .../Editor/js/ckeditor/plugins/iframe/images/placeholder.png      |  Bin 0 -> 264 bytes
 framework/Editor/js/ckeditor/plugins/iframedialog/plugin.js       |    1 +
 framework/Editor/js/ckeditor/plugins/image/dialogs/image.js       |    1 +
 framework/Editor/js/ckeditor/plugins/link/dialogs/anchor.js       |    1 +
 framework/Editor/js/ckeditor/plugins/link/dialogs/link.js         |    1 +
 framework/Editor/js/ckeditor/plugins/link/images/anchor.gif       |  Bin 0 -> 184 bytes
 .../Editor/js/ckeditor/plugins/liststyle/dialogs/liststyle.js     |    1 +
 .../Editor/js/ckeditor/plugins/pagebreak/images/pagebreak.gif     |  Bin 0 -> 54 bytes
 .../Editor/js/ckeditor/plugins/pastefromword/filter/default.js    |    1 +
 .../Editor/js/ckeditor/plugins/pastetext/dialogs/pastetext.js     |    1 +
 .../Editor/js/ckeditor/plugins/placeholder/dialogs/placeholder.js |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/bg.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/cs.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/cy.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/da.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/de.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/el.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/en.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/eo.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/et.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/fa.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/fi.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/fr.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/he.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/hr.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/it.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/ku.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/nb.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/nl.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/no.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/pl.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/pt-br.js    |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/sk.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/tr.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/ug.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/uk.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/vi.js       |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/zh-cn.js    |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/placeholder.gif  |  Bin 0 -> 96 bytes
 framework/Editor/js/ckeditor/plugins/placeholder/plugin.js        |    1 +
 framework/Editor/js/ckeditor/plugins/preview/preview.html         |   10 +
 framework/Editor/js/ckeditor/plugins/scayt/dialogs/options.js     |    1 +
 framework/Editor/js/ckeditor/plugins/scayt/dialogs/toolbar.css    |    6 +
 .../js/ckeditor/plugins/showblocks/images/block_address.png       |  Bin 0 -> 152 bytes
 .../js/ckeditor/plugins/showblocks/images/block_blockquote.png    |  Bin 0 -> 154 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_div.png    |  Bin 0 -> 127 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h1.png     |  Bin 0 -> 119 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h2.png     |  Bin 0 -> 127 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h3.png     |  Bin 0 -> 123 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h4.png     |  Bin 0 -> 123 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h5.png     |  Bin 0 -> 126 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h6.png     |  Bin 0 -> 123 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_p.png      |  Bin 0 -> 115 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_pre.png    |  Bin 0 -> 127 bytes
 framework/Editor/js/ckeditor/plugins/smiley/dialogs/smiley.js     |    1 +
 .../Editor/js/ckeditor/plugins/smiley/images/angel_smile.gif      |  Bin 0 -> 465 bytes
 .../Editor/js/ckeditor/plugins/smiley/images/angry_smile.gif      |  Bin 0 -> 443 bytes
 .../Editor/js/ckeditor/plugins/smiley/images/broken_heart.gif     |  Bin 0 -> 192 bytes
 .../Editor/js/ckeditor/plugins/smiley/images/confused_smile.gif   |  Bin 0 -> 464 bytes
 framework/Editor/js/ckeditor/plugins/smiley/images/cry_smile.gif  |  Bin 0 -> 468 bytes
 .../Editor/js/ckeditor/plugins/smiley/images/devil_smile.gif      |  Bin 0 -> 436 bytes
 .../Editor/js/ckeditor/plugins/smiley/images/embaressed_smile.gif |  Bin 0 -> 442 bytes
 framework/Editor/js/ckeditor/plugins/smiley/images/envelope.gif   |  Bin 0 -> 426 bytes
 framework/Editor/js/ckeditor/plugins/smiley/images/heart.gif      |  Bin 0 -> 183 bytes
 framework/Editor/js/ckeditor/plugins/smiley/images/kiss.gif       |  Bin 0 -> 241 bytes
 framework/Editor/js/ckeditor/plugins/smiley/images/lightbulb.gif  |  Bin 0 -> 368 bytes
 framework/Editor/js/ckeditor/plugins/smiley/images/omg_smile.gif  |  Bin 0 -> 451 bytes
 .../Editor/js/ckeditor/plugins/smiley/images/regular_smile.gif    |  Bin 0 -> 450 bytes
 framework/Editor/js/ckeditor/plugins/smiley/images/sad_smile.gif  |  Bin 0 -> 460 bytes
 .../Editor/js/ckeditor/plugins/smiley/images/shades_smile.gif     |  Bin 0 -> 449 bytes
 .../Editor/js/ckeditor/plugins/smiley/images/teeth_smile.gif      |  Bin 0 -> 442 bytes
 .../Editor/js/ckeditor/plugins/smiley/images/thumbs_down.gif      |  Bin 0 -> 408 bytes
 framework/Editor/js/ckeditor/plugins/smiley/images/thumbs_up.gif  |  Bin 0 -> 396 bytes
 .../Editor/js/ckeditor/plugins/smiley/images/tounge_smile.gif     |  Bin 0 -> 446 bytes
 .../ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif  |  Bin 0 -> 452 bytes
 framework/Editor/js/ckeditor/plugins/smiley/images/wink_smile.gif |  Bin 0 -> 458 bytes
 .../Editor/js/ckeditor/plugins/specialchar/dialogs/specialchar.js |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/cs.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/cy.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/de.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/el.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/en.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/eo.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/et.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/fa.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/fi.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/fr.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/he.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/hr.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/it.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/ku.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/nb.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/nl.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/no.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/pt-br.js    |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/tr.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/ug.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/zh-cn.js    |    1 +
 framework/Editor/js/ckeditor/plugins/styles/styles/default.js     |    1 +
 framework/Editor/js/ckeditor/plugins/stylesheetparser/plugin.js   |    1 +
 .../ckeditor/plugins/syntaxhighlight/dialogs/syntaxhighlight.js   |    1 +
 .../ckeditor/plugins/syntaxhighlight/images/syntaxhighlight.gif   |  Bin 0 -> 94 bytes
 framework/Editor/js/ckeditor/plugins/syntaxhighlight/lang/en.js   |    1 +
 framework/Editor/js/ckeditor/plugins/syntaxhighlight/plugin.js    |    1 +
 framework/Editor/js/ckeditor/plugins/table/dialogs/table.js       |    1 +
 framework/Editor/js/ckeditor/plugins/tableresize/plugin.js        |    1 +
 .../Editor/js/ckeditor/plugins/tabletools/dialogs/tableCell.js    |    1 +
 .../Editor/js/ckeditor/plugins/templates/dialogs/templates.js     |    1 +
 .../Editor/js/ckeditor/plugins/templates/templates/default.js     |    1 +
 .../js/ckeditor/plugins/templates/templates/images/template1.gif  |  Bin 0 -> 375 bytes
 .../js/ckeditor/plugins/templates/templates/images/template2.gif  |  Bin 0 -> 333 bytes
 .../js/ckeditor/plugins/templates/templates/images/template3.gif  |  Bin 0 -> 422 bytes
 framework/Editor/js/ckeditor/plugins/uicolor/dialogs/uicolor.js   |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/bg.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/cs.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/cy.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/da.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/de.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/el.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/en.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/eo.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/et.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/fa.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/fi.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/fr.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/he.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/hr.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/it.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/ku.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/mk.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/nb.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/nl.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/no.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/pl.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/pt-br.js        |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/sk.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/tr.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/ug.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/uk.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/vi.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/zh-cn.js        |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/plugin.js            |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/uicolor.gif          |  Bin 0 -> 1108 bytes
 .../Editor/js/ckeditor/plugins/uicolor/yui/assets/hue_bg.png      |  Bin 0 -> 1019 bytes
 .../Editor/js/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png   |  Bin 0 -> 133 bytes
 .../Editor/js/ckeditor/plugins/uicolor/yui/assets/picker_mask.png |  Bin 0 -> 10560 bytes
 .../js/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png       |  Bin 0 -> 125 bytes
 framework/Editor/js/ckeditor/plugins/uicolor/yui/assets/yui.css   |    6 +
 framework/Editor/js/ckeditor/plugins/uicolor/yui/yui.js           |    1 +
 framework/Editor/js/ckeditor/plugins/wsc/dialogs/ciframe.html     |   49 +
 framework/Editor/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html |   52 +
 framework/Editor/js/ckeditor/plugins/wsc/dialogs/wsc.css          |    6 +
 framework/Editor/js/ckeditor/plugins/wsc/dialogs/wsc.js           |    1 +
 framework/Editor/js/ckeditor/plugins/xml/plugin.js                |    1 +
 framework/Editor/js/ckeditor/skins/kama/dialog.css                |   10 +
 framework/Editor/js/ckeditor/skins/kama/editor.css                |   13 +
 framework/Editor/js/ckeditor/skins/kama/icons.png                 |  Bin 0 -> 4627 bytes
 framework/Editor/js/ckeditor/skins/kama/icons_rtl.png             |  Bin 0 -> 4639 bytes
 framework/Editor/js/ckeditor/skins/kama/images/dialog_sides.gif   |  Bin 0 -> 48 bytes
 framework/Editor/js/ckeditor/skins/kama/images/dialog_sides.png   |  Bin 0 -> 126 bytes
 .../Editor/js/ckeditor/skins/kama/images/dialog_sides_rtl.png     |  Bin 0 -> 131 bytes
 framework/Editor/js/ckeditor/skins/kama/images/mini.gif           |  Bin 0 -> 183 bytes
 framework/Editor/js/ckeditor/skins/kama/images/noimage.png        |  Bin 0 -> 2114 bytes
 framework/Editor/js/ckeditor/skins/kama/images/sprites.png        |  Bin 0 -> 5485 bytes
 framework/Editor/js/ckeditor/skins/kama/images/sprites_ie6.png    |  Bin 0 -> 2558 bytes
 framework/Editor/js/ckeditor/skins/kama/images/toolbar_start.gif  |  Bin 0 -> 105 bytes
 framework/Editor/js/ckeditor/skins/kama/skin.js                   |    1 +
 framework/Editor/js/ckeditor/skins/kama/templates.css             |    6 +
 framework/Editor/js/ckeditor/skins/office2003/dialog.css          |   10 +
 framework/Editor/js/ckeditor/skins/office2003/editor.css          |   14 +
 framework/Editor/js/ckeditor/skins/office2003/icons.png           |  Bin 0 -> 4627 bytes
 framework/Editor/js/ckeditor/skins/office2003/icons_rtl.png       |  Bin 0 -> 4639 bytes
 .../Editor/js/ckeditor/skins/office2003/images/dialog_sides.gif   |  Bin 0 -> 48 bytes
 .../Editor/js/ckeditor/skins/office2003/images/dialog_sides.png   |  Bin 0 -> 127 bytes
 .../js/ckeditor/skins/office2003/images/dialog_sides_rtl.png      |  Bin 0 -> 131 bytes
 framework/Editor/js/ckeditor/skins/office2003/images/mini.gif     |  Bin 0 -> 183 bytes
 framework/Editor/js/ckeditor/skins/office2003/images/noimage.png  |  Bin 0 -> 2114 bytes
 framework/Editor/js/ckeditor/skins/office2003/images/sprites.png  |  Bin 0 -> 5040 bytes
 .../Editor/js/ckeditor/skins/office2003/images/sprites_ie6.png    |  Bin 0 -> 2371 bytes
 framework/Editor/js/ckeditor/skins/office2003/skin.js             |    1 +
 framework/Editor/js/ckeditor/skins/office2003/templates.css       |    6 +
 framework/Editor/js/ckeditor/skins/v2/dialog.css                  |    9 +
 framework/Editor/js/ckeditor/skins/v2/editor.css                  |   13 +
 framework/Editor/js/ckeditor/skins/v2/icons.png                   |  Bin 0 -> 4627 bytes
 framework/Editor/js/ckeditor/skins/v2/icons_rtl.png               |  Bin 0 -> 4639 bytes
 framework/Editor/js/ckeditor/skins/v2/images/dialog_sides.gif     |  Bin 0 -> 48 bytes
 framework/Editor/js/ckeditor/skins/v2/images/dialog_sides.png     |  Bin 0 -> 126 bytes
 framework/Editor/js/ckeditor/skins/v2/images/dialog_sides_rtl.png |  Bin 0 -> 131 bytes
 framework/Editor/js/ckeditor/skins/v2/images/mini.gif             |  Bin 0 -> 183 bytes
 framework/Editor/js/ckeditor/skins/v2/images/noimage.png          |  Bin 0 -> 2114 bytes
 framework/Editor/js/ckeditor/skins/v2/images/sprites.png          |  Bin 0 -> 2213 bytes
 framework/Editor/js/ckeditor/skins/v2/images/sprites_ie6.png      |  Bin 0 -> 404 bytes
 framework/Editor/js/ckeditor/skins/v2/images/toolbar_start.gif    |  Bin 0 -> 105 bytes
 framework/Editor/js/ckeditor/skins/v2/skin.js                     |    1 +
 framework/Editor/js/ckeditor/skins/v2/templates.css               |    6 +
 framework/Editor/js/ckeditor/themes/default/theme.js              |    1 +
 framework/Editor/js/ckeditor_basic.js                             |    1 -
 framework/Editor/js/config.js                                     |    1 -
 framework/Editor/js/contents.css                                  |   25 -
 framework/Editor/js/images/spacer.gif                             |  Bin 43 -> 0 bytes
 framework/Editor/js/lang/_languages.js                            |    1 -
 framework/Editor/js/lang/af.js                                    |    1 -
 framework/Editor/js/lang/ar.js                                    |    1 -
 framework/Editor/js/lang/bg.js                                    |    1 -
 framework/Editor/js/lang/bn.js                                    |    1 -
 framework/Editor/js/lang/bs.js                                    |    1 -
 framework/Editor/js/lang/ca.js                                    |    1 -
 framework/Editor/js/lang/cs.js                                    |    1 -
 framework/Editor/js/lang/cy.js                                    |    1 -
 framework/Editor/js/lang/da.js                                    |    1 -
 framework/Editor/js/lang/de.js                                    |    1 -
 framework/Editor/js/lang/el.js                                    |    1 -
 framework/Editor/js/lang/en-au.js                                 |    1 -
 framework/Editor/js/lang/en-ca.js                                 |    1 -
 framework/Editor/js/lang/en-gb.js                                 |    1 -
 framework/Editor/js/lang/en.js                                    |    1 -
 framework/Editor/js/lang/eo.js                                    |    1 -
 framework/Editor/js/lang/es.js                                    |    1 -
 framework/Editor/js/lang/et.js                                    |    1 -
 framework/Editor/js/lang/eu.js                                    |    1 -
 framework/Editor/js/lang/fa.js                                    |    1 -
 framework/Editor/js/lang/fi.js                                    |    1 -
 framework/Editor/js/lang/fo.js                                    |    1 -
 framework/Editor/js/lang/fr-ca.js                                 |    1 -
 framework/Editor/js/lang/fr.js                                    |    1 -
 framework/Editor/js/lang/gl.js                                    |    1 -
 framework/Editor/js/lang/gu.js                                    |    1 -
 framework/Editor/js/lang/he.js                                    |    1 -
 framework/Editor/js/lang/hi.js                                    |    1 -
 framework/Editor/js/lang/hr.js                                    |    1 -
 framework/Editor/js/lang/hu.js                                    |    1 -
 framework/Editor/js/lang/id.js                                    |    1 -
 framework/Editor/js/lang/is.js                                    |    1 -
 framework/Editor/js/lang/it.js                                    |    1 -
 framework/Editor/js/lang/ja.js                                    |    1 -
 framework/Editor/js/lang/ka.js                                    |    1 -
 framework/Editor/js/lang/km.js                                    |    1 -
 framework/Editor/js/lang/ko.js                                    |    1 -
 framework/Editor/js/lang/ku.js                                    |    1 -
 framework/Editor/js/lang/lt.js                                    |    1 -
 framework/Editor/js/lang/lv.js                                    |    1 -
 framework/Editor/js/lang/mk.js                                    |    1 -
 framework/Editor/js/lang/mn.js                                    |    1 -
 framework/Editor/js/lang/ms.js                                    |    1 -
 framework/Editor/js/lang/nb.js                                    |    1 -
 framework/Editor/js/lang/nl.js                                    |    1 -
 framework/Editor/js/lang/no.js                                    |    1 -
 framework/Editor/js/lang/pl.js                                    |    1 -
 framework/Editor/js/lang/pt-br.js                                 |    1 -
 framework/Editor/js/lang/pt.js                                    |    1 -
 framework/Editor/js/lang/ro.js                                    |    1 -
 framework/Editor/js/lang/ru.js                                    |    1 -
 framework/Editor/js/lang/sk.js                                    |    1 -
 framework/Editor/js/lang/sl.js                                    |    1 -
 framework/Editor/js/lang/sr-latn.js                               |    1 -
 framework/Editor/js/lang/sr.js                                    |    1 -
 framework/Editor/js/lang/sv.js                                    |    1 -
 framework/Editor/js/lang/th.js                                    |    1 -
 framework/Editor/js/lang/tr.js                                    |    1 -
 framework/Editor/js/lang/ug.js                                    |    1 -
 framework/Editor/js/lang/uk.js                                    |    1 -
 framework/Editor/js/lang/vi.js                                    |    1 -
 framework/Editor/js/lang/zh-cn.js                                 |    1 -
 framework/Editor/js/lang/zh.js                                    |    1 -
 framework/Editor/js/plugins/a11yhelp/dialogs/a11yhelp.js          |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/cs.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/cy.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/da.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/de.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/el.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/en.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/eo.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/fa.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/fi.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/fr.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/gu.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/he.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/it.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/ku.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/mk.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/nb.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/nl.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/no.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/pt-br.js                |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/ro.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/sk.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/tr.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/ug.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/vi.js                   |    1 -
 framework/Editor/js/plugins/a11yhelp/lang/zh-cn.js                |    1 -
 framework/Editor/js/plugins/about/dialogs/about.js                |    1 -
 framework/Editor/js/plugins/about/dialogs/logo_ckeditor.png       |  Bin 2759 -> 0 bytes
 framework/Editor/js/plugins/adobeair/plugin.js                    |    1 -
 framework/Editor/js/plugins/ajax/plugin.js                        |    1 -
 framework/Editor/js/plugins/autogrow/plugin.js                    |    1 -
 framework/Editor/js/plugins/bbcode/plugin.js                      |    1 -
 framework/Editor/js/plugins/clipboard/dialogs/paste.js            |    1 -
 framework/Editor/js/plugins/colordialog/dialogs/colordialog.js    |    1 -
 framework/Editor/js/plugins/devtools/lang/bg.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/cs.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/cy.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/da.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/de.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/el.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/en.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/eo.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/et.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/fa.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/fi.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/fr.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/gu.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/he.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/hr.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/it.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/ku.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/nb.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/nl.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/no.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/pl.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/pt-br.js                |    1 -
 framework/Editor/js/plugins/devtools/lang/sk.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/tr.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/ug.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/uk.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/vi.js                   |    1 -
 framework/Editor/js/plugins/devtools/lang/zh-cn.js                |    1 -
 framework/Editor/js/plugins/devtools/plugin.js                    |    1 -
 framework/Editor/js/plugins/div/dialogs/div.js                    |    1 -
 framework/Editor/js/plugins/docprops/dialogs/docprops.js          |    1 -
 framework/Editor/js/plugins/docprops/plugin.js                    |    1 -
 framework/Editor/js/plugins/find/dialogs/find.js                  |    1 -
 framework/Editor/js/plugins/flash/dialogs/flash.js                |    1 -
 framework/Editor/js/plugins/flash/images/placeholder.png          |  Bin 256 -> 0 bytes
 framework/Editor/js/plugins/forms/dialogs/button.js               |    1 -
 framework/Editor/js/plugins/forms/dialogs/checkbox.js             |    1 -
 framework/Editor/js/plugins/forms/dialogs/form.js                 |    1 -
 framework/Editor/js/plugins/forms/dialogs/hiddenfield.js          |    1 -
 framework/Editor/js/plugins/forms/dialogs/radio.js                |    1 -
 framework/Editor/js/plugins/forms/dialogs/select.js               |    1 -
 framework/Editor/js/plugins/forms/dialogs/textarea.js             |    1 -
 framework/Editor/js/plugins/forms/dialogs/textfield.js            |    1 -
 framework/Editor/js/plugins/forms/images/hiddenfield.gif          |  Bin 105 -> 0 bytes
 framework/Editor/js/plugins/iframe/dialogs/iframe.js              |    1 -
 framework/Editor/js/plugins/iframe/images/placeholder.png         |  Bin 264 -> 0 bytes
 framework/Editor/js/plugins/iframedialog/plugin.js                |    1 -
 framework/Editor/js/plugins/image/dialogs/image.js                |    1 -
 framework/Editor/js/plugins/link/dialogs/anchor.js                |    1 -
 framework/Editor/js/plugins/link/dialogs/link.js                  |    1 -
 framework/Editor/js/plugins/link/images/anchor.gif                |  Bin 184 -> 0 bytes
 framework/Editor/js/plugins/liststyle/dialogs/liststyle.js        |    1 -
 framework/Editor/js/plugins/pagebreak/images/pagebreak.gif        |  Bin 54 -> 0 bytes
 framework/Editor/js/plugins/pastefromword/filter/default.js       |    1 -
 framework/Editor/js/plugins/pastetext/dialogs/pastetext.js        |    1 -
 framework/Editor/js/plugins/placeholder/dialogs/placeholder.js    |    1 -
 framework/Editor/js/plugins/placeholder/lang/bg.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/cs.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/cy.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/da.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/de.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/el.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/en.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/eo.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/et.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/fa.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/fi.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/fr.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/he.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/hr.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/it.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/ku.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/nb.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/nl.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/no.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/pl.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/pt-br.js             |    1 -
 framework/Editor/js/plugins/placeholder/lang/sk.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/tr.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/ug.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/uk.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/vi.js                |    1 -
 framework/Editor/js/plugins/placeholder/lang/zh-cn.js             |    1 -
 framework/Editor/js/plugins/placeholder/placeholder.gif           |  Bin 96 -> 0 bytes
 framework/Editor/js/plugins/placeholder/plugin.js                 |    1 -
 framework/Editor/js/plugins/preview/preview.html                  |   10 -
 framework/Editor/js/plugins/scayt/dialogs/options.js              |    1 -
 framework/Editor/js/plugins/scayt/dialogs/toolbar.css             |    6 -
 framework/Editor/js/plugins/showblocks/images/block_address.png   |  Bin 152 -> 0 bytes
 .../Editor/js/plugins/showblocks/images/block_blockquote.png      |  Bin 154 -> 0 bytes
 framework/Editor/js/plugins/showblocks/images/block_div.png       |  Bin 127 -> 0 bytes
 framework/Editor/js/plugins/showblocks/images/block_h1.png        |  Bin 119 -> 0 bytes
 framework/Editor/js/plugins/showblocks/images/block_h2.png        |  Bin 127 -> 0 bytes
 framework/Editor/js/plugins/showblocks/images/block_h3.png        |  Bin 123 -> 0 bytes
 framework/Editor/js/plugins/showblocks/images/block_h4.png        |  Bin 123 -> 0 bytes
 framework/Editor/js/plugins/showblocks/images/block_h5.png        |  Bin 126 -> 0 bytes
 framework/Editor/js/plugins/showblocks/images/block_h6.png        |  Bin 123 -> 0 bytes
 framework/Editor/js/plugins/showblocks/images/block_p.png         |  Bin 115 -> 0 bytes
 framework/Editor/js/plugins/showblocks/images/block_pre.png       |  Bin 127 -> 0 bytes
 framework/Editor/js/plugins/smiley/dialogs/smiley.js              |    1 -
 framework/Editor/js/plugins/smiley/images/angel_smile.gif         |  Bin 465 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/angry_smile.gif         |  Bin 443 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/broken_heart.gif        |  Bin 192 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/confused_smile.gif      |  Bin 464 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/cry_smile.gif           |  Bin 468 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/devil_smile.gif         |  Bin 436 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/embaressed_smile.gif    |  Bin 442 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/envelope.gif            |  Bin 426 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/heart.gif               |  Bin 183 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/kiss.gif                |  Bin 241 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/lightbulb.gif           |  Bin 368 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/omg_smile.gif           |  Bin 451 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/regular_smile.gif       |  Bin 450 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/sad_smile.gif           |  Bin 460 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/shades_smile.gif        |  Bin 449 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/teeth_smile.gif         |  Bin 442 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/thumbs_down.gif         |  Bin 408 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/thumbs_up.gif           |  Bin 396 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/tounge_smile.gif        |  Bin 446 -> 0 bytes
 .../Editor/js/plugins/smiley/images/whatchutalkingabout_smile.gif |  Bin 452 -> 0 bytes
 framework/Editor/js/plugins/smiley/images/wink_smile.gif          |  Bin 458 -> 0 bytes
 framework/Editor/js/plugins/specialchar/dialogs/specialchar.js    |    1 -
 framework/Editor/js/plugins/specialchar/lang/cs.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/cy.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/de.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/el.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/en.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/eo.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/et.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/fa.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/fi.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/fr.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/he.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/hr.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/it.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/ku.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/nb.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/nl.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/no.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/pt-br.js             |    1 -
 framework/Editor/js/plugins/specialchar/lang/tr.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/ug.js                |    1 -
 framework/Editor/js/plugins/specialchar/lang/zh-cn.js             |    1 -
 framework/Editor/js/plugins/styles/styles/default.js              |    1 -
 framework/Editor/js/plugins/stylesheetparser/plugin.js            |    1 -
 .../Editor/js/plugins/syntaxhighlight/dialogs/syntaxhighlight.js  |    1 -
 .../Editor/js/plugins/syntaxhighlight/images/syntaxhighlight.gif  |  Bin 94 -> 0 bytes
 framework/Editor/js/plugins/syntaxhighlight/lang/en.js            |    1 -
 framework/Editor/js/plugins/syntaxhighlight/plugin.js             |    1 -
 framework/Editor/js/plugins/table/dialogs/table.js                |    1 -
 framework/Editor/js/plugins/tableresize/plugin.js                 |    1 -
 framework/Editor/js/plugins/tabletools/dialogs/tableCell.js       |    1 -
 framework/Editor/js/plugins/templates/dialogs/templates.js        |    1 -
 framework/Editor/js/plugins/templates/templates/default.js        |    1 -
 .../Editor/js/plugins/templates/templates/images/template1.gif    |  Bin 375 -> 0 bytes
 .../Editor/js/plugins/templates/templates/images/template2.gif    |  Bin 333 -> 0 bytes
 .../Editor/js/plugins/templates/templates/images/template3.gif    |  Bin 422 -> 0 bytes
 framework/Editor/js/plugins/uicolor/dialogs/uicolor.js            |    1 -
 framework/Editor/js/plugins/uicolor/lang/bg.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/cs.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/cy.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/da.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/de.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/el.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/en.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/eo.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/et.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/fa.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/fi.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/fr.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/he.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/hr.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/it.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/ku.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/mk.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/nb.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/nl.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/no.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/pl.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/pt-br.js                 |    1 -
 framework/Editor/js/plugins/uicolor/lang/sk.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/tr.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/ug.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/uk.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/vi.js                    |    1 -
 framework/Editor/js/plugins/uicolor/lang/zh-cn.js                 |    1 -
 framework/Editor/js/plugins/uicolor/plugin.js                     |    1 -
 framework/Editor/js/plugins/uicolor/uicolor.gif                   |  Bin 1108 -> 0 bytes
 framework/Editor/js/plugins/uicolor/yui/assets/hue_bg.png         |  Bin 1019 -> 0 bytes
 framework/Editor/js/plugins/uicolor/yui/assets/hue_thumb.png      |  Bin 133 -> 0 bytes
 framework/Editor/js/plugins/uicolor/yui/assets/picker_mask.png    |  Bin 10560 -> 0 bytes
 framework/Editor/js/plugins/uicolor/yui/assets/picker_thumb.png   |  Bin 125 -> 0 bytes
 framework/Editor/js/plugins/uicolor/yui/assets/yui.css            |    6 -
 framework/Editor/js/plugins/uicolor/yui/yui.js                    |    1 -
 framework/Editor/js/plugins/wsc/dialogs/ciframe.html              |   49 -
 framework/Editor/js/plugins/wsc/dialogs/tmpFrameset.html          |   52 -
 framework/Editor/js/plugins/wsc/dialogs/wsc.css                   |    6 -
 framework/Editor/js/plugins/wsc/dialogs/wsc.js                    |    1 -
 framework/Editor/js/plugins/xml/plugin.js                         |    1 -
 framework/Editor/js/skins/kama/dialog.css                         |   10 -
 framework/Editor/js/skins/kama/editor.css                         |   13 -
 framework/Editor/js/skins/kama/icons.png                          |  Bin 4627 -> 0 bytes
 framework/Editor/js/skins/kama/icons_rtl.png                      |  Bin 4639 -> 0 bytes
 framework/Editor/js/skins/kama/images/dialog_sides.gif            |  Bin 48 -> 0 bytes
 framework/Editor/js/skins/kama/images/dialog_sides.png            |  Bin 126 -> 0 bytes
 framework/Editor/js/skins/kama/images/dialog_sides_rtl.png        |  Bin 131 -> 0 bytes
 framework/Editor/js/skins/kama/images/mini.gif                    |  Bin 183 -> 0 bytes
 framework/Editor/js/skins/kama/images/noimage.png                 |  Bin 2114 -> 0 bytes
 framework/Editor/js/skins/kama/images/sprites.png                 |  Bin 5485 -> 0 bytes
 framework/Editor/js/skins/kama/images/sprites_ie6.png             |  Bin 2558 -> 0 bytes
 framework/Editor/js/skins/kama/images/toolbar_start.gif           |  Bin 105 -> 0 bytes
 framework/Editor/js/skins/kama/skin.js                            |    1 -
 framework/Editor/js/skins/kama/templates.css                      |    6 -
 framework/Editor/js/skins/office2003/dialog.css                   |   10 -
 framework/Editor/js/skins/office2003/editor.css                   |   14 -
 framework/Editor/js/skins/office2003/icons.png                    |  Bin 4627 -> 0 bytes
 framework/Editor/js/skins/office2003/icons_rtl.png                |  Bin 4639 -> 0 bytes
 framework/Editor/js/skins/office2003/images/dialog_sides.gif      |  Bin 48 -> 0 bytes
 framework/Editor/js/skins/office2003/images/dialog_sides.png      |  Bin 127 -> 0 bytes
 framework/Editor/js/skins/office2003/images/dialog_sides_rtl.png  |  Bin 131 -> 0 bytes
 framework/Editor/js/skins/office2003/images/mini.gif              |  Bin 183 -> 0 bytes
 framework/Editor/js/skins/office2003/images/noimage.png           |  Bin 2114 -> 0 bytes
 framework/Editor/js/skins/office2003/images/sprites.png           |  Bin 5040 -> 0 bytes
 framework/Editor/js/skins/office2003/images/sprites_ie6.png       |  Bin 2371 -> 0 bytes
 framework/Editor/js/skins/office2003/skin.js                      |    1 -
 framework/Editor/js/skins/office2003/templates.css                |    6 -
 framework/Editor/js/skins/v2/dialog.css                           |    9 -
 framework/Editor/js/skins/v2/editor.css                           |   13 -
 framework/Editor/js/skins/v2/icons.png                            |  Bin 4627 -> 0 bytes
 framework/Editor/js/skins/v2/icons_rtl.png                        |  Bin 4639 -> 0 bytes
 framework/Editor/js/skins/v2/images/dialog_sides.gif              |  Bin 48 -> 0 bytes
 framework/Editor/js/skins/v2/images/dialog_sides.png              |  Bin 126 -> 0 bytes
 framework/Editor/js/skins/v2/images/dialog_sides_rtl.png          |  Bin 131 -> 0 bytes
 framework/Editor/js/skins/v2/images/mini.gif                      |  Bin 183 -> 0 bytes
 framework/Editor/js/skins/v2/images/noimage.png                   |  Bin 2114 -> 0 bytes
 framework/Editor/js/skins/v2/images/sprites.png                   |  Bin 2213 -> 0 bytes
 framework/Editor/js/skins/v2/images/sprites_ie6.png               |  Bin 404 -> 0 bytes
 framework/Editor/js/skins/v2/images/toolbar_start.gif             |  Bin 105 -> 0 bytes
 framework/Editor/js/skins/v2/skin.js                              |    1 -
 framework/Editor/js/skins/v2/templates.css                        |    6 -
 framework/Editor/js/themes/default/theme.js                       |    1 -
 framework/Editor/lib/Horde/Editor/Ckeditor.php                    |    4 +-
 framework/Editor/package.xml                                      | 1770 +-
 framework/Icalendar/package.xml                                   |   92 +-
 framework/Icalendar/test/Horde/Icalendar/AttributeTest.php        |   62 +
 framework/Icalendar/test/Horde/Icalendar/CharsetTest.php          |   27 +
 framework/Icalendar/test/Horde/Icalendar/ExportTest.php           |  157 +
 framework/Icalendar/test/Horde/Icalendar/FreeBusyTest.php         |  340 +
 framework/Icalendar/test/Horde/Icalendar/ParseTest.php            |  357 +
 framework/Icalendar/test/Horde/Icalendar/bug_7423.phpt            |   32 -
 framework/Icalendar/test/Horde/Icalendar/charset1.phpt            |   50 -
 framework/Icalendar/test/Horde/Icalendar/common.php               |   16 -
 framework/Icalendar/test/Horde/Icalendar/empty_data.phpt          |   30 -
 framework/Icalendar/test/Horde/Icalendar/fixtures/bug7423.ics     |   11 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/charset1.ics    |   14 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/charset2.ics    |   14 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/charset3.ics    |   14 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/date.ics        |   14 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/empty.ics       |    4 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/escapes1.ics    |   28 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/escapes2.ics    |   21 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/geo1.vcf        |    4 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/geo2.vcf        |    4 +
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-1.ics    |   13 +
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-2.ics    |   12 +
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-3.ics    |   13 +
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-4.ics    |   14 +
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-5.ics    |   16 +
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-6.ics    |   27 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/org.vcf         |    5 +
 .../Icalendar/test/Horde/Icalendar/fixtures/quoted-params.ics     |   14 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/vcal20.ics      |   28 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/vfreebusy1.ics  |   14 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/vfreebusy2.ics  |    9 +
 framework/Icalendar/test/Horde/Icalendar/geo.phpt                 |   37 -
 framework/Icalendar/test/Horde/Icalendar/iCalendar.phpt           |   36 -
 framework/Icalendar/test/Horde/Icalendar/line-folding.phpt        |  180 -
 framework/Icalendar/test/Horde/Icalendar/quoted-params.phpt       |   43 -
 framework/Icalendar/test/Horde/Icalendar/read-escapes.phpt        |   59 -
 framework/Icalendar/test/Horde/Icalendar/read-vcard-org.phpt      |   25 -
 framework/Icalendar/test/Horde/Icalendar/read-write-escapes.phpt  |   43 -
 framework/Icalendar/test/Horde/Icalendar/timezones.phpt           |  828 -
 framework/Icalendar/test/Horde/Icalendar/vcal20.phpt              |  321 -
 framework/Icalendar/test/Horde/Icalendar/vfreebusy.phpt           |  269 -
 framework/Icalendar/test/Horde/Icalendar/write-escapes.phpt       |   51 -
 framework/Ldap/lib/Horde/Ldap/Util.php                            |   30 +-
 framework/Mime/lib/Horde/Mime.php                                 |    7 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Emails.php            |    7 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Linkurls.php          |    7 +-
 framework/Vcs/lib/Horde/Vcs/Directory/Git.php                     |    6 +-
 gollem/locale/lv/LC_MESSAGES/gollem.mo                            |  Bin 79365 -> 71548 bytes
 hermes/locale/lv/LC_MESSAGES/hermes.mo                            |  Bin 77282 -> 69443 bytes
 horde/docs/CODING_STANDARDS                                       |    3 +-
 horde/lib/Application.php                                         |   24 +-
 horde/locale/lv/LC_MESSAGES/horde.mo                              |  Bin 71437 -> 63566 bytes
 horde/locale/lv/LC_MESSAGES/horde.po                              | 2069 +--
 imp/compose.php                                                   |    2 +-
 imp/docs/CHANGES                                                  |    9 +
 imp/lib/Compose/References.php                                    |   37 +-
 imp/locale/lv/LC_MESSAGES/imp.mo                                  |  Bin 188944 -> 174783 bytes
 imp/locale/lv/LC_MESSAGES/imp.po                                  | 4599 ++---
 imp/package.xml                                                   |   13 +
 imp/templates/basic/compose/compose.html.php                      |    2 +-
 imp/templates/smartmobile/mailbox.html.php                        |    4 +-
 imp/test/Imp/Unit/ReferencesTest.php                              |   18 +
 ingo/locale/lv/LC_MESSAGES/ingo.mo                                |  Bin 88763 -> 82040 bytes
 ingo/locale/lv/LC_MESSAGES/ingo.po                                |  527 +-
 jonah/locale/lv/LC_MESSAGES/jonah.mo                              |  Bin 79227 -> 71372 bytes
 klutz/lib/Comic.php                                               |   30 +-
 klutz/locale/lv/LC_MESSAGES/klutz.mo                              |  Bin 74703 -> 66784 bytes
 kronolith/docs/CHANGES                                            |    1 +
 kronolith/js/kronolith.js                                         |    4 +-
 kronolith/lib/Event.php                                           |    4 +-
 kronolith/locale/lv/LC_MESSAGES/kronolith.mo                      |  Bin 131595 -> 123141 bytes
 kronolith/locale/lv/LC_MESSAGES/kronolith.po                      | 1833 +-
 kronolith/package.xml                                             |   12 +-
 kronolith/test/Kronolith/Integration/FromIcalendarTest.php        |   13 +
 kronolith/test/Kronolith/fixtures/bug11688.ics                    |   53 +
 luxor/lib/Lang.php                                                |   16 +-
 luxor/lib/SimpleParse.php                                         |   11 +-
 luxor/locale/lv/LC_MESSAGES/luxor.mo                              |  Bin 73340 -> 65421 bytes
 mnemo/locale/lv/LC_MESSAGES/mnemo.mo                              |  Bin 81491 -> 72876 bytes
 mnemo/locale/lv/LC_MESSAGES/mnemo.po                              |  369 +-
 nag/locale/lv/LC_MESSAGES/nag.mo                                  |  Bin 95431 -> 87560 bytes
 passwd/locale/lv/LC_MESSAGES/passwd.mo                            |  Bin 80496 -> 72678 bytes
 sam/locale/lv/LC_MESSAGES/sam.mo                                  |  Bin 74454 -> 66583 bytes
 sesha/locale/lv/LC_MESSAGES/sesha.mo                              |  Bin 77292 -> 69413 bytes
 timeobjects/locale/lv/LC_MESSAGES/timeobjects.mo                  |  Bin 72063 -> 65215 bytes
 trean/locale/lv/LC_MESSAGES/trean.mo                              |  Bin 81875 -> 74012 bytes
 turba/locale/lv/LC_MESSAGES/turba.mo                              |  Bin 102352 -> 94304 bytes
 turba/locale/lv/LC_MESSAGES/turba.po                              |  770 +-
 ulaform/locale/lv/LC_MESSAGES/ulaform.mo                          |  Bin 76573 -> 68718 bytes
 vilma/locale/lv/LC_MESSAGES/vilma.mo                              |  Bin 78896 -> 71057 bytes
 whups/locale/lv/LC_MESSAGES/whups.mo                              |  Bin 94668 -> 86808 bytes
 wicked/lib/Page/MergeOrRename.php                                 |   10 +-
 wicked/locale/lv/LC_MESSAGES/wicked.mo                            |  Bin 76136 -> 68313 bytes
 792 files changed, 8929 insertions(+), 10351 deletions(-)

http://git.horde.org/horde-git/-/commit/5d047d73008cadff9f5452f9cf48b85e2596d598

-----------------------------------------------------------------------

commit aa8658001921287e9c77c7647329f5adf1866795
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 14 20:44:07 2013 -0700

    [mms] Abstract all UIDs used for mailbox/message navigation on the browser to BUIDs (browser UIDs) (Bug #10719).
    
    Separates backend message manipulation from UI presentation.
    
    Allows for easier/cleaner manipulation on the browser side:
    
      * No need to keep track of the both the current display mailbox AND the
        message mailbox - makes javascript much cleaner
      * Browser UIDs are always integers so large ranges can be efficiently
        packed using message sequence strings
      * All message manipulation is now abstracted and looks the same in
        every mailbox - no need to change method of sending UIDs based on
        the current mailbox type ("real" mailbox vs. virtual)

 imp/bin/imp-mailbox-decode                        |   14 +--
 imp/compose.php                                   |   21 +-
 imp/docs/CHANGES                                  |    2 +
 imp/js/compose.js                                 |    1 +
 imp/js/dimpbase.js                                |  212 +++++++++----------
 imp/js/dimpcore.js                                |   75 +------
 imp/js/flagprefs.js                               |    1 +
 imp/js/imp.js                                     |    3 +-
 imp/js/indices.js                                 |  121 -----------
 imp/js/message-dimp.js                            |   63 +++---
 imp/js/smartmobile.js                             |  235 +++++++++++----------
 imp/js/viewport.js                                |   30 +--
 imp/js/viewport_utils.js                          |   72 +++++++
 imp/lib/Ajax/Application.php                      |   60 ++----
 imp/lib/Ajax/Application/Handler/Common.php       |  124 ++++-------
 imp/lib/Ajax/Application/Handler/Dynamic.php      |   90 ++++-----
 imp/lib/Ajax/Application/Handler/ImageUnblock.php |    6 +-
 imp/lib/Ajax/Application/Handler/Smartmobile.php  |   19 --
 imp/lib/Ajax/Application/ListMessages.php         |   68 ++-----
 imp/lib/Ajax/Application/ShowMessage.php          |   54 ++---
 imp/lib/Ajax/Imple/ImportEncryptKey.php           |   13 +-
 imp/lib/Ajax/Imple/ItipRequest.php                |   11 +-
 imp/lib/Ajax/Queue.php                            |   80 +++++---
 imp/lib/Application.php                           |    9 +-
 imp/lib/Auth.php                                  |    8 +-
 imp/lib/Basic/Compose.php                         |   58 +++++
 imp/lib/Compose.php                               |   20 +-
 imp/lib/Contents.php                              |   86 ++++----
 imp/lib/Contents/View.php                         |   10 +-
 imp/lib/Dynamic/Base.php                          |    9 +-
 imp/lib/Dynamic/Compose.php                       |   52 +++--
 imp/lib/Dynamic/Message.php                       |   19 +-
 imp/lib/Factory/MailboxList.php                   |   27 +--
 imp/lib/Factory/Quota.php                         |    3 -
 imp/lib/IMP.php                                   |   93 --------
 imp/lib/Indices.php                               |   22 +-
 imp/lib/Indices/Form.php                          |   50 -----
 imp/lib/Indices/Mailbox.php                       |   90 ++++++++
 imp/lib/Mailbox.php                               |   98 ++++++---
 imp/lib/Mailbox/List.php                          |  112 ++++++++--
 imp/lib/Mailbox/List/Pop3.php                     |   74 +++++++
 imp/lib/Mailbox/List/Virtual.php                  |   46 ++++-
 imp/lib/Message.php                               |    2 +-
 imp/lib/Mime/Viewer/Html.php                      |    3 +-
 imp/lib/Mime/Viewer/Itip.php                      |    3 +-
 imp/lib/Mime/Viewer/Pgp.php                       |    5 +-
 imp/lib/Mime/Viewer/Smime.php                     |    5 +-
 imp/lib/Minimal/Base.php                          |    9 +-
 imp/lib/Minimal/Compose.php                       |   44 +++--
 imp/lib/Minimal/Mailbox.php                       |   67 +++---
 imp/lib/Minimal/Message.php                       |   78 ++++---
 imp/lib/Minimal/Messagepart.php                   |   24 +--
 imp/lib/Minimal/Search.php                        |   14 +-
 imp/lib/Quota.php                                 |    4 +-
 imp/lib/Quota/Command.php                         |    8 +-
 imp/lib/Quota/Hook.php                            |    8 +-
 imp/lib/Quota/Imap.php                            |   21 +--
 imp/lib/Quota/Maildir.php                         |    8 +-
 imp/lib/Quota/Mdaemon.php                         |    8 +-
 imp/lib/Quota/Mercury32.php                       |   12 +-
 imp/lib/Quota/Null.php                            |    8 +-
 imp/lib/Quota/Sql.php                             |   12 +-
 imp/lib/Search.php                                |    1 +
 imp/lib/Smartmobile.php                           |    2 -
 imp/lib/Ui/Compose.php                            |   51 -----
 imp/lib/Ui/Message.php                            |    6 +-
 imp/lib/Ui/Quota.php                              |    6 +-
 imp/lib/View/Subinfo.php                          |   40 +++--
 imp/mailbox.php                                   |  137 ++++++------
 imp/message.php                                   |   94 ++++-----
 imp/package.xml                                   |   20 ++-
 imp/rss.php                                       |    4 +-
 imp/saveimage.php                                 |    9 +-
 imp/search-basic.php                              |   11 +-
 imp/search.php                                    |   11 +-
 imp/templates/basic/mailbox/mailbox.html.php      |    4 +-
 imp/templates/basic/message/navbar_top.html.php   |    2 +-
 imp/templates/minimal/mailbox.html.php            |    2 +-
 imp/templates/saveimage/saveimage.html.php        |    3 +-
 imp/templates/smartmobile/copymove.html.php       |    2 +-
 imp/thread.php                                    |   30 +--
 imp/view.php                                      |    8 +-
 82 files changed, 1484 insertions(+), 1563 deletions(-)
 delete mode 100644 imp/js/indices.js
 create mode 100644 imp/js/viewport_utils.js
 create mode 100644 imp/lib/Basic/Compose.php
 delete mode 100644 imp/lib/Indices/Form.php
 create mode 100644 imp/lib/Indices/Mailbox.php
 create mode 100644 imp/lib/Mailbox/List/Pop3.php

http://git.horde.org/horde-git/-/commit/aa8658001921287e9c77c7647329f5adf1866795

-----------------------------------------------------------------------

commit a48dc006e868d959313336cfef3d7b2c6937c21e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 14 22:20:54 2013 -0700

    [mms] Display Virtual Folders in smartmobile view.

 imp/docs/CHANGES                                 |    1 +
 imp/lib/Ajax/Application/Handler/Smartmobile.php |    7 ++++++-
 imp/lib/Imap/Tree.php                            |    4 ++--
 imp/package.xml                                  |    2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/a48dc006e868d959313336cfef3d7b2c6937c21e

-----------------------------------------------------------------------

commit 5114bfbcfd00246d2f9596b823282ca05919614e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 14 22:53:04 2013 -0700

    Fix typo

 imp/lib/Ajax/Application/ListMessages.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/5114bfbcfd00246d2f9596b823282ca05919614e

-----------------------------------------------------------------------

commit 86a7b3e7eb1beef1dbef8753ace435c0eea9e33e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 14 23:45:26 2013 -0700

    thismailbox no longer exists (thankfully)

 imp/lib/IMP.php                                 |    6 ++----
 imp/lib/Ui/Compose.php                          |    2 +-
 imp/templates/basic/message/navbar_top.html.php |    1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/86a7b3e7eb1beef1dbef8753ace435c0eea9e33e

-----------------------------------------------------------------------

commit bb77c585a570edf1df9e6be250f3512820cc102b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 15 01:39:38 2013 -0700

    Fixes to IMP::composeLink()

 imp/lib/IMP.php             |    8 ++------
 imp/lib/Minimal/Mailbox.php |    2 +-
 imp/mailbox.php             |    3 ++-
 imp/message.php             |    5 +----
 4 files changed, 6 insertions(+), 12 deletions(-)

http://git.horde.org/horde-git/-/commit/bb77c585a570edf1df9e6be250f3512820cc102b

-----------------------------------------------------------------------

commit 185f37cb1c6767f58023c5bd12a992eae916238d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 15 17:23:25 2013 -0700

    Fixes/cleanups from BUIDs rewrite

 imp/js/dimpbase.js                           |   37 +++++++++++--------------
 imp/js/smartmobile.js                        |   15 +++++-----
 imp/lib/Ajax/Application/Handler/Common.php  |    4 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php |   37 ++++++++++++--------------
 imp/lib/Ajax/Queue.php                       |    2 +-
 imp/lib/Indices/Mailbox.php                  |    2 +-
 imp/lib/Minimal/Base.php                     |    2 +-
 imp/lib/Minimal/Compose.php                  |    1 -
 8 files changed, 45 insertions(+), 55 deletions(-)

http://git.horde.org/horde-git/-/commit/185f37cb1c6767f58023c5bd12a992eae916238d

-----------------------------------------------------------------------

commit 6b1b21c4bc23b81b3af4341125dc597c603273ae
Merge: 185f37c 5ba78f9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 15 19:14:39 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/message.php
    	imp/package.xml
    	imp/templates/basic/mailbox/mailbox.html.php

 ansel/js/tagactions.js                                     |   48 ---
 ansel/js/togglewidget.js                                   |   21 +-
 ansel/js/widgets/tagactions.js                             |   60 ++++
 ansel/lib/Ajax/Application/Handler.php                     |   15 +-
 ansel/lib/Widget/Actions.php                               |  182 +++++-------
 ansel/lib/Widget/Tags.php                                  |   60 +++--
 ansel/package.xml                                          |   18 +-
 ansel/templates/widgets/actions.html.php                   |   59 ++++
 ansel/templates/widgets/begin.html.php                     |    3 +
 ansel/templates/widgets/end.html.php                       |    1 +
 ansel/templates/widgets/tags.html.php                      |   16 +
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |    9 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php    |   15 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php        |   60 ++--
 framework/ActiveSync/package.xml                           |   24 ++-
 framework/Auth/lib/Horde/Auth/Smb.php                      |    4 +-
 framework/Auth/lib/Horde/Auth/Smbclient.php                |    4 +-
 framework/Auth/package.xml                                 |    2 +
 framework/Core/lib/Horde/Core/Ui/ModalFormRenderer.php     |   14 -
 framework/Core/package.xml                                 |    4 +-
 framework/Date/lib/Horde/Date/Utils.php                    |    6 +-
 framework/Date/package.xml                                 |    6 +-
 imp/attachment.php                                         |    8 +-
 imp/compose.php                                            |    8 +-
 imp/contacts.php                                           |   16 +-
 imp/docs/CHANGES                                           |    2 +
 imp/folders.php                                            |    1 -
 imp/lib/Dynamic/Message.php                                |    2 +-
 imp/mailbox.php                                            |    8 +-
 imp/message.php                                            |    7 +-
 imp/package.xml                                            |    1 +
 imp/templates/basic/compose/compose.html.php               |   14 +-
 imp/templates/basic/compose/redirect.html.php              |    4 +-
 imp/templates/basic/folders/folders_confirm.html.php       |    2 +-
 imp/templates/basic/folders/folders_size.html.php          |    2 +-
 imp/templates/basic/folders/import.html.php                |    2 +-
 imp/templates/basic/mailbox/mailbox.html.php               |    6 +-
 imp/templates/basic/mailbox/navbar.html.php                |    4 +-
 imp/templates/basic/message/message.html.php               |    2 +-
 imp/templates/contacts/contacts.html.php                   |    8 +-
 imp/themes/default/screen.css                              |    1 -
 ingo/lib/Transport/Vfs.php                                 |    2 -
 kronolith/docs/CHANGES                                     |    3 +
 kronolith/js/kronolith.js                                  |    9 +-
 kronolith/lib/Application.php                              |   15 +-
 kronolith/lib/Event.php                                    |   31 ++-
 kronolith/package.xml                                      |    6 +
 mnemo/docs/CHANGES                                         |    1 +
 mnemo/lib/Application.php                                  |    3 +
 mnemo/package.xml                                          |    4 +-
 skeleton/lib/Exception.php                                 |    2 +-
 51 files changed, 470 insertions(+), 335 deletions(-)

http://git.horde.org/horde-git/-/commit/6b1b21c4bc23b81b3af4341125dc597c603273ae

-----------------------------------------------------------------------

commit 3f02e74158659ac6fc0c51df2fdb2fe1277ce8cd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 15 20:27:27 2013 -0700

    Fix typo

 imp/message.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/3f02e74158659ac6fc0c51df2fdb2fe1277ce8cd

-----------------------------------------------------------------------

commit 699adba4e043b9a325a721d164c64b31f39497cb
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 15 21:31:07 2013 -0700

    Fix missing comma

 imp/js/message-dimp.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/699adba4e043b9a325a721d164c64b31f39497cb

-----------------------------------------------------------------------

commit e414f771ae91b9a1b0d2b02c289b12fe6b63260e
Merge: 699adba 9074e21
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 13:33:17 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 framework/Share/test/Horde/Share/Base.php           |    2 +-
 framework/Share/test/Horde/Share/Kolab/MockTest.php |    4 +-
 framework/Share/test/Horde/Share/Sql/Base.php       |    2 +-
 framework/Share/test/Horde/Share/Sqlng/Base.php     |    2 +-
 framework/Text_Filter/package.xml                   |    3 +
 framework/Timezone/doc/Horde/Timezone/COPYING       |  458 +++++++++++++++++++
 framework/Timezone/package.xml                      |   18 +-
 imp/docs/CHANGES                                    |    2 +
 imp/js/dimpbase.js                                  |   21 +-
 imp/js/mailbox.js                                   |    4 +-
 imp/lib/Dynamic/Compose.php                         |    4 +-
 imp/lib/Notification/Event/Status.php               |    6 +-
 imp/mailbox.php                                     |    2 +-
 imp/package.xml                                     |    2 +
 imp/templates/basic/mailbox/navbar.html.php         |    2 +-
 imp/templates/dynamic/mailbox.html.php              |   12 +-
 imp/templates/dynamic/message.html.php              |    6 +-
 turba/lib/Driver/Share.php                          |    2 +-
 whups/admin/index.php                               |    2 +
 whups/lib/Application.php                           |   18 +-
 whups/lib/Whups.php                                 |   17 +-
 whups/mybugs.php                                    |    2 +
 whups/mybugs_edit.php                               |    2 +
 whups/query/index.php                               |    2 +
 whups/query/run.php                                 |    2 +
 whups/reports.php                                   |    2 +
 whups/search.php                                    |    2 +
 whups/templates/menu.inc                            |    7 -
 whups/themes/default/screen.css                     |   14 +
 whups/ticket/comment.php                            |    2 +
 whups/ticket/create.php                             |    2 +
 whups/ticket/delete.php                             |    2 +
 whups/ticket/index.php                              |    7 +-
 whups/ticket/queue.php                              |    2 +
 whups/ticket/type.php                               |    2 +
 whups/ticket/update.php                             |    2 +
 whups/ticket/watch.php                              |    2 +
 37 files changed, 589 insertions(+), 54 deletions(-)

http://git.horde.org/horde-git/-/commit/e414f771ae91b9a1b0d2b02c289b12fe6b63260e

-----------------------------------------------------------------------

commit d63cc9b74b32e68046244ba972f13179bfe3fbd0
Merge: e414f77 344aa59
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 15:22:11 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/compose.php
    	imp/docs/CHANGES
    	imp/lib/Dynamic/Compose/Common.php
    	imp/package.xml

 imp/compose.php                              |   13 +++---
 imp/docs/CHANGES                             |    1 +
 imp/lib/Ajax/Application/Handler/Dynamic.php |   24 ++++++-----
 imp/lib/Compose.php                          |   56 +++++++++++++++-----------
 imp/lib/Dynamic/Compose/Common.php           |   15 ++++++-
 imp/lib/Minimal/Compose.php                  |   28 +++++++------
 imp/package.xml                              |    1 +
 imp/templates/dynamic/compose.html.php       |    9 ++++-
 8 files changed, 91 insertions(+), 56 deletions(-)

http://git.horde.org/horde-git/-/commit/d63cc9b74b32e68046244ba972f13179bfe3fbd0

-----------------------------------------------------------------------

commit c185b0a451ff86531dab972ac5774a929bc5f5da
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 15:35:49 2013 -0700

    Move attachment-related options in dynamic compose screen to dropdown adjacent to attachment upload element

 imp/js/compose-dimp.js                 |   29 +++++++++++++++++++----------
 imp/js/dimpcore.js                     |    3 ++-
 imp/lib/Dynamic/Compose/Common.php     |    8 ++++----
 imp/templates/dynamic/compose.html.php |    2 +-
 imp/themes/default/dynamic/screen.css  |    4 ++--
 5 files changed, 28 insertions(+), 18 deletions(-)

http://git.horde.org/horde-git/-/commit/c185b0a451ff86531dab972ac5774a929bc5f5da

-----------------------------------------------------------------------

commit a5e30c03b3e7833ccb08c648cfcd8d9337211405
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 16:05:24 2013 -0700

    Make linking attachments a run-time decision when calling buildAndSendMessage()

 imp/compose.php     |    2 +-
 imp/lib/Compose.php |   31 ++++++++-----------------------
 2 files changed, 9 insertions(+), 24 deletions(-)

http://git.horde.org/horde-git/-/commit/a5e30c03b3e7833ccb08c648cfcd8d9337211405

-----------------------------------------------------------------------

commit de60c203af12b68a1219b55a727277bf99717826
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 16:09:03 2013 -0700

    [mms] Support link attachment feature in dynamic view.

 imp/docs/CHANGES                            |    1 +
 imp/js/compose-dimp.js                      |   11 +++++++++--
 imp/lib/Ajax/Application/Handler/Common.php |   18 +++++++++++-------
 imp/lib/Dynamic/Compose/Common.php          |   15 ++++++++++++---
 imp/package.xml                             |    2 ++
 imp/templates/dynamic/compose.html.php      |    1 +
 6 files changed, 36 insertions(+), 12 deletions(-)

http://git.horde.org/horde-git/-/commit/de60c203af12b68a1219b55a727277bf99717826

-----------------------------------------------------------------------

commit 2cc8207e381eae3b0ac145e6a9b7d55d9b387aff
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 19:58:05 2013 -0700

    [mms] Converted 'link_all_attachments' configuration option to the 'link_attach' preference.
    
    Allows for more granular control of the display, and allows the default
    value to be set while still allowing a user to unset it.

 imp/compose.php                             |    8 +++++---
 imp/config/conf.xml                         |    3 ---
 imp/config/prefs.php                        |   13 ++++++++++++-
 imp/docs/CHANGES                            |    2 ++
 imp/docs/UPGRADING                          |    7 +++++++
 imp/lib/Ajax/Application/Handler/Common.php |    9 ++++++++-
 imp/lib/Compose.php                         |    7 ++++---
 imp/lib/Dynamic/Compose/Common.php          |   10 ++++++++--
 imp/package.xml                             |    2 ++
 imp/templates/dynamic/compose.html.php      |    4 +++-
 10 files changed, 51 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/2cc8207e381eae3b0ac145e6a9b7d55d9b387aff

-----------------------------------------------------------------------

commit 9b900eb212db6b5a1678347c9e4be04c269b39ed
Merge: 2cc8207 07d7571
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 21:23:29 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/compose.php
    	imp/js/smartmobile.js

 framework/Core/js/growler-jquery.js                     |    2 +-
 framework/Core/js/jquery.mobile/plugins/autocomplete.js |    4 +-
 imp/js/smartmobile.js                                   |   18 +++++++-------
 imp/view.php                                            |    4 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/9b900eb212db6b5a1678347c9e4be04c269b39ed

-----------------------------------------------------------------------

commit da62bfa18cece14f0af9c92f715df90340b02309
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 22:50:05 2013 -0700

    More fixes for BUID conversion

 imp/js/message-dimp.js      |    6 +++---
 imp/lib/Dynamic/Message.php |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/da62bfa18cece14f0af9c92f715df90340b02309

-----------------------------------------------------------------------

commit 3cae0ff53042faa260b3913313620d1dda351531
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 22:50:33 2013 -0700

    Fix typo

 imp/js/compose-dimp.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/3cae0ff53042faa260b3913313620d1dda351531

-----------------------------------------------------------------------

commit 357fb9007dc33a8e2e365fe8ba674f2318bd9f9f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 23:50:20 2013 -0700

    [mms] Smartmobile view now uses additive loading instead of pagination on the mailbox page.

 imp/docs/CHANGES                           |    2 +
 imp/js/smartmobile.js                      |  155 +++++++++++-----------------
 imp/lib/Smartmobile.php                    |    1 +
 imp/package.xml                            |    2 +
 imp/templates/smartmobile/mailbox.html.php |    5 -
 imp/themes/default/smartmobile/screen.css  |    3 +-
 6 files changed, 66 insertions(+), 102 deletions(-)

http://git.horde.org/horde-git/-/commit/357fb9007dc33a8e2e365fe8ba674f2318bd9f9f

-----------------------------------------------------------------------

commit 212909ea01bb7bdd09de66c16b2a094dbb5f28c5
Merge: 357fb90 efeb04c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 18 13:14:56 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/Ajax/Application/Handler/Dynamic.php
    	imp/mailbox.php
    	imp/package.xml

 ansel/lib/Widget/Actions.php                                      |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php   |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Attachment.php  |   12 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Contact.php     |  132 ++--
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php        |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php      |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php  |   14 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php     |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php   |    2 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/ItemOperations.php    |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php   |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php        |   18 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/ResolveRecipients.php |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |   84 ++--
 .../ActiveSync/lib/Horde/ActiveSync/Request/ValidateCert.php      |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |   48 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Utils.php               |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php               |   11 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php       |   28 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php       |   24 +-
 framework/Ldap/test/Horde/Ldap/LdifTest.php                       |    8 +-
 framework/Ldap/test/Horde/Ldap/fixtures/changes.ldif              |    2 +-
 framework/Ldap/test/Horde/Ldap/fixtures/sorted_w40.ldif           |    8 +-
 framework/Ldap/test/Horde/Ldap/fixtures/sorted_w50.ldif           |    8 +-
 framework/Ldap/test/Horde/Ldap/fixtures/unsorted_w30.ldif         |    8 +-
 framework/Ldap/test/Horde/Ldap/fixtures/unsorted_w50.ldif         |    8 +-
 framework/Ldap/test/Horde/Ldap/fixtures/unsorted_w50_WIN.ldif     |    8 +-
 imp/docs/CHANGES                                                  |    2 +
 imp/lib/Ajax/Application.php                                      |    2 +
 imp/lib/Ajax/Application/Handler/Dynamic.php                      |   47 --
 imp/lib/Ajax/Application/Handler/Mboxtoggle.php                   |   72 +++
 imp/lib/Prefs/Special/Searches.php                                |    1 +
 imp/mailbox.php                                                   |   16 +-
 imp/package.xml                                                   |    8 +-
 kronolith/docs/CHANGES                                            |    2 +
 kronolith/js/kronolith.js                                         |    5 +-
 kronolith/package.xml                                             |    2 +
 turba/data.php                                                    |   13 +-
 turba/docs/CHANGES                                                |    1 +
 turba/lib/Data/Ldif.php                                           |    2 +-
 turba/package.xml                                                 |    4 +-
 44 files changed, 370 insertions(+), 272 deletions(-)

http://git.horde.org/horde-git/-/commit/212909ea01bb7bdd09de66c16b2a094dbb5f28c5

-----------------------------------------------------------------------

commit 0a63162c5a4e1f5ac5b773d2c01df1157cef4fe9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 18 13:21:00 2013 -0700

    Move PGP public key attachment to send-time decision

 imp/compose.php     |    2 +-
 imp/lib/Compose.php |   33 +++++++++------------------------
 2 files changed, 10 insertions(+), 25 deletions(-)

http://git.horde.org/horde-git/-/commit/0a63162c5a4e1f5ac5b773d2c01df1157cef4fe9

-----------------------------------------------------------------------

commit 5ed72641f41c8933f5de3df2d36ef230c73238e7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 18 13:35:16 2013 -0700

    Move Vcard attachment to send-time decision

 imp/compose.php     |    6 ++----
 imp/lib/Compose.php |   40 +++++++++++-----------------------------
 2 files changed, 13 insertions(+), 33 deletions(-)

http://git.horde.org/horde-git/-/commit/5ed72641f41c8933f5de3df2d36ef230c73238e7

-----------------------------------------------------------------------

commit 5eae49a75aabbc21a66c595f4382edf9fc5311f3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 18 14:52:19 2013 -0700

    Abstract context checkbox code on dynamic compose screen.

 imp/js/compose-dimp.js |   54 +++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 28 deletions(-)

http://git.horde.org/horde-git/-/commit/5eae49a75aabbc21a66c595f4382edf9fc5311f3

-----------------------------------------------------------------------

commit fc26058748ae3966df41ddb8da7414c75b09f017
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 18 14:53:48 2013 -0700

    [mms] Support attaching PGP public keys in dynamic compose.

 imp/docs/CHANGES                            |    1 +
 imp/js/compose-dimp.js                      |    1 +
 imp/lib/Ajax/Application/Handler/Common.php |    3 +++
 imp/lib/Dynamic/Compose/Common.php          |   10 ++++++++++
 imp/package.xml                             |    2 ++
 imp/templates/dynamic/compose.html.php      |    3 +++
 6 files changed, 20 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/fc26058748ae3966df41ddb8da7414c75b09f017

-----------------------------------------------------------------------

commit c7ca080f211087d80c4a38733b5b671649fcd2e2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 18 15:00:31 2013 -0700

    [mms] Support attaching vCard in dynamic compose.

 imp/docs/CHANGES                            |    1 +
 imp/js/compose-dimp.js                      |    3 ++-
 imp/lib/Ajax/Application/Handler/Common.php |    4 +++-
 imp/lib/Dynamic/Compose/Common.php          |    8 ++++++++
 imp/package.xml                             |    2 ++
 imp/templates/dynamic/compose.html.php      |    3 +++
 6 files changed, 19 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/c7ca080f211087d80c4a38733b5b671649fcd2e2

-----------------------------------------------------------------------

commit 69bbf8428d453eace53ac4f33ace7d21c460316f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 18 19:09:03 2013 -0700

    Fix viewport data loss in smartmobile view

 imp/lib/Ajax/Application.php                |    4 ++++
 imp/lib/Ajax/Application/Handler/Common.php |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/69bbf8428d453eace53ac4f33ace7d21c460316f

-----------------------------------------------------------------------

commit 4bb6ff1f0aac2d8b69649dd2cee77aed669c7312
Merge: 69bbf84 b57866a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 21 11:52:23 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/View/Subinfo.php

 ansel/js/widgets/tagactions.js                             |   15 +-
 ansel/lib/Ajax/Application/Handler.php                     |   20 +-
 ansel/lib/Widget/Actions.php                               |    9 +-
 ansel/lib/Widget/OtherGalleries.php                        |   62 +-
 ansel/lib/Widget/Tags.php                                  |   15 +-
 ansel/package.xml                                          |    6 +-
 ansel/templates/widgets/othergalleries.html.php            |    9 +
 ansel/templates/widgets/tags.html.php                      |    1 +
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php |   13 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |   20 +-
 framework/ActiveSync/package.xml                           |   36 +-
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING      |    8 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php       |    7 +-
 framework/Imap_Client/package.xml                          |   12 +-
 framework/Mime/lib/Horde/Mime/Part.php                     |   22 +-
 framework/Mime/package.xml                                 |    4 +-
 framework/Mime/test/Horde/Mime/PartTest.php                |   42 +
 framework/Mime/test/Horde/Mime/fixtures/deeply_nested.txt  |  710 ++++++++++++
 hermes/lib/Ajax.php                                        |    2 +-
 imp/lib/Dynamic/Base.php                                   |    4 +-
 imp/lib/Dynamic/Compose.php                                |    4 +-
 imp/lib/Dynamic/Helper/Base.php                            |    4 +-
 imp/lib/Dynamic/Mailbox.php                                |    4 +-
 imp/lib/Dynamic/Message.php                                |    4 +-
 imp/lib/Minimal/Base.php                                   |    2 +-
 imp/lib/Minimal/Compose.php                                |    2 +-
 imp/lib/Minimal/Folders.php                                |    2 +-
 imp/lib/Minimal/Mailbox.php                                |    2 +-
 imp/lib/Minimal/Message.php                                |    2 +-
 imp/lib/Minimal/Messagepart.php                            |    2 +-
 imp/lib/Minimal/Search.php                                 |    2 +-
 imp/lib/Smartmobile.php                                    |    2 +-
 imp/lib/View/Subinfo.php                                   |    2 +-
 kronolith/lib/Ajax.php                                     |    2 +-
 35 files changed, 940 insertions(+), 116 deletions(-)

http://git.horde.org/horde-git/-/commit/4bb6ff1f0aac2d8b69649dd2cee77aed669c7312

-----------------------------------------------------------------------

commit 6e798180fa786fba43358ed541bd3c59ae0c2f39
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 21 18:43:32 2013 -0700

    Make sure there is at least one message

 imp/lib/Ajax/Application.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/6e798180fa786fba43358ed541bd3c59ae0c2f39

-----------------------------------------------------------------------

commit 4f9c98221d829d053ed046e5ec2fa9c3d4da6e09
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 21 18:46:04 2013 -0700

    Optimize going from text->html if there is no current compose text

 imp/js/compose-dimp.js |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/4f9c98221d829d053ed046e5ec2fa9c3d4da6e09

-----------------------------------------------------------------------

commit a27500a89529540b46aeca0d7adae3cc039cf121
Merge: 4f9c982 16c2d04
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 21 21:12:24 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php       |   12 +-
 framework/Imap_Client/package.xml                            |    2 +
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php  |   30 ++
 framework/Imap_Client/test/Horde/Imap/Client/Stub/Socket.php |   12 +-
 imp/js/compose-base.js                                       |   15 +-
 turba/docs/CHANGES                                           |    1 +
 turba/lib/Data/Ldif.php                                      |  165 +++++-----
 turba/lib/Driver/Share.php                                   |   12 +
 turba/package.xml                                            |    2 +
 9 files changed, 162 insertions(+), 89 deletions(-)

http://git.horde.org/horde-git/-/commit/a27500a89529540b46aeca0d7adae3cc039cf121

-----------------------------------------------------------------------

commit 8b7409c2a16b74f0e073ed0942c5b9c5a2169334
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 21 23:57:26 2013 -0700

    This should be on by default for signatures

 imp/config/prefs.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8b7409c2a16b74f0e073ed0942c5b9c5a2169334

-----------------------------------------------------------------------

commit d95fb3afa68bf735a3a83da5339dc89a67e64140
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 00:00:55 2013 -0700

    filter on display not needed here

 imp/lib/Application.php |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/d95fb3afa68bf735a3a83da5339dc89a67e64140

-----------------------------------------------------------------------

commit 2d9faf1d4530fd6c4370de7a25b30187c291b10c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 00:19:36 2013 -0700

    [mms] Remove 'compose_cc' and 'compose_bcc' preferences.
    
    Not any compelling reason for these anymore (you are already allowed to
    send messages via To, so this doesn't prevent abuse or anything)
    
    If it really needs to be hidden, this can easily be done via CSS.

 imp/compose.php                           |   28 ++++++++--------------------
 imp/config/prefs.php                      |   23 +++++------------------
 imp/docs/CHANGES                          |    1 +
 imp/docs/UPGRADING                        |    8 ++++++++
 imp/js/compose-dimp.js                    |    6 +++---
 imp/lib/Ajax/Application.php              |   15 +++++----------
 imp/lib/Dynamic/Compose.php               |    8 +-------
 imp/lib/Dynamic/Compose/Common.php        |    4 ----
 imp/lib/Dynamic/Message.php               |   10 ++--------
 imp/lib/LoginTasks/SystemTask/Upgrade.php |   12 ++++++++++++
 imp/lib/Minimal/Compose.php               |   12 +++++-------
 imp/package.xml                           |    2 ++
 imp/templates/dynamic/compose.html.php    |   10 ----------
 13 files changed, 52 insertions(+), 87 deletions(-)

http://git.horde.org/horde-git/-/commit/2d9faf1d4530fd6c4370de7a25b30187c291b10c

-----------------------------------------------------------------------

commit aa5c03201c291e1c99f324c54a871c525e043dc0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 00:36:08 2013 -0700

    Allow PDF thumbnails to be disabled

 imp/config/mime_drivers.php |    5 ++++-
 imp/lib/Mime/Viewer/Pdf.php |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/aa5c03201c291e1c99f324c54a871c525e043dc0

-----------------------------------------------------------------------

commit afe4eecffbdf8e1213350d957c4151112a455a3c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 00:39:18 2013 -0700

    Allow image thumbnails to be disabled

 imp/config/mime_drivers.php    |    5 ++++-
 imp/docs/UPGRADING             |    6 ++++++
 imp/lib/Mime/Viewer/Images.php |    4 ++++
 3 files changed, 14 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/afe4eecffbdf8e1213350d957c4151112a455a3c

-----------------------------------------------------------------------

commit 1fbdb70a7943fa23dd8196a45ee22a66ef71bf9a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 00:45:31 2013 -0700

    Remove signature hook
    
    The same thing can be accomplished via preference hooks

 imp/config/hooks.php.dist  |   21 ---------------------
 imp/docs/UPGRADING         |    6 ++++++
 imp/lib/Prefs/Identity.php |    4 ----
 3 files changed, 6 insertions(+), 25 deletions(-)

http://git.horde.org/horde-git/-/commit/1fbdb70a7943fa23dd8196a45ee22a66ef71bf9a

-----------------------------------------------------------------------

commit a2928af3fa19da711c2ae51576d8abc3088f86a8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 01:00:19 2013 -0700

    DIMP -> Dynamic

 imp/js/compose-dimp.js                |    2 +-
 imp/js/dimpbase.js                    |    4 ++--
 imp/js/dimpcore.js                    |    1 -
 imp/themes/default/dynamic/screen.css |    4 ----
 4 files changed, 3 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/a2928af3fa19da711c2ae51576d8abc3088f86a8

-----------------------------------------------------------------------

commit af09a7dc74b077ca456a353fb002fdccf58ff7d4
Merge: a2928af 7caaa2d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 03:50:00 2013 -0700

    Merge branch 'master' into imp_6_1

 .gitignore                                                        |    1 +
 framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php         |    7 +-
 framework/Core/package.xml                                        |    2 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Format/List.php  |    8 +-
 .../Imap_Client/test/Horde/Imap/Client/RemoteImapServerTest.php   |  404 +++++
 framework/Imap_Client/test/Horde/Imap/Client/conf.php.dist        |   10 +
 framework/Imap_Client/test/Horde/Imap/Client/fixtures/remote1.txt |   14 +
 framework/Imap_Client/test/Horde/Imap/Client/fixtures/remote2.txt |   17 +
 framework/Imap_Client/test/Horde/Imap/Client/fixtures/remote3.txt |   14 +
 framework/Imap_Client/test/Horde/Imap/Client/fixtures/remote4.txt |  112 ++
 11 files changed, 583 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/af09a7dc74b077ca456a353fb002fdccf58ff7d4

-----------------------------------------------------------------------

commit b468ebfae081873a9aea8f8569f1deac7396b5f3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 04:34:16 2013 -0700

    [mms] Dynamically display MIME type icon for attachments uploaded on the dynamic compose page.

 imp/docs/CHANGES                      |    2 ++
 imp/js/compose-dimp.js                |   22 +++++++++++++++++++---
 imp/lib/Ajax/Application/Compose.php  |    4 +++-
 imp/package.xml                       |    2 ++
 imp/themes/default/dynamic/screen.css |    9 +++++++--
 5 files changed, 33 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/b468ebfae081873a9aea8f8569f1deac7396b5f3

-----------------------------------------------------------------------

commit 52c4119e09c36f279e3e5c3fdff6f0101a6e6e57
Merge: b468ebf 50a1755
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 17:42:55 2013 -0700

    Merge branch 'master' into imp_6_1

 agora/locale/fr/LC_MESSAGES/agora.mo                              |  Bin 77537 -> 70318 bytes
 ansel/docs/CREDITS                                                |    2 +
 ansel/locale/fr/LC_MESSAGES/ansel.mo                              |  Bin 117196 -> 108033 bytes
 ansel/locale/fr/LC_MESSAGES/ansel.po                              | 2937 ++---
 chora/locale/fr/LC_MESSAGES/chora.mo                              |  Bin 80332 -> 73209 bytes
 framework/ActiveSync/locale/fr/LC_MESSAGES/Horde_ActiveSync.mo    |  Bin 0 -> 1026 bytes
 framework/ActiveSync/locale/fr/LC_MESSAGES/Horde_ActiveSync.po    |   73 +
 framework/ActiveSync/package.xml                                  |    4 +-
 framework/Alarm/locale/fr/LC_MESSAGES/Horde_Alarm.mo              |  Bin 461 -> 827 bytes
 framework/Alarm/locale/fr/LC_MESSAGES/Horde_Alarm.po              |   34 +-
 framework/Argv/locale/fr/LC_MESSAGES/Horde_Argv.mo                |  Bin 461 -> 1560 bytes
 framework/Argv/locale/fr/LC_MESSAGES/Horde_Argv.po                |   64 +-
 framework/Argv/package.xml                                        |    4 +-
 framework/Auth/locale/fr/LC_MESSAGES/Horde_Auth.mo                |  Bin 0 -> 3473 bytes
 framework/Auth/locale/fr/LC_MESSAGES/Horde_Auth.po                |  119 +
 framework/Auth/package.xml                                        |    2 +
 framework/Cli/locale/fr/LC_MESSAGES/Horde_Cli.mo                  |  Bin 614 -> 792 bytes
 framework/Cli/locale/fr/LC_MESSAGES/Horde_Cli.po                  |   33 +-
 framework/Cli/package.xml                                         |    4 +-
 framework/Compress/locale/fr/LC_MESSAGES/Horde_Compress.mo        |  Bin 634 -> 1018 bytes
 framework/Compress/locale/fr/LC_MESSAGES/Horde_Compress.po        |   41 +-
 framework/Compress/package.xml                                    |    4 +-
 framework/Core/locale/fr/LC_MESSAGES/Horde_Core.mo                |  Bin 10834 -> 20140 bytes
 framework/Core/locale/fr/LC_MESSAGES/Horde_Core.po                |  996 +-
 framework/Core/package.xml                                        |    2 +
 framework/Crypt/locale/fr/LC_MESSAGES/Horde_Crypt.mo              |  Bin 7992 -> 7566 bytes
 framework/Crypt/locale/fr/LC_MESSAGES/Horde_Crypt.po              |  284 +-
 framework/Crypt/package.xml                                       |    4 +-
 framework/Data/locale/fr/LC_MESSAGES/Horde_Data.mo                |  Bin 550 -> 1349 bytes
 framework/Data/locale/fr/LC_MESSAGES/Horde_Data.po                |   45 +-
 framework/Data/package.xml                                        |    4 +-
 framework/Date/locale/fr/LC_MESSAGES/Horde_Date.mo                |  Bin 645 -> 1236 bytes
 framework/Date/locale/fr/LC_MESSAGES/Horde_Date.po                |   68 +-
 framework/Date/package.xml                                        |    2 +
 framework/Exception/locale/fr/LC_MESSAGES/Horde_Exception.mo      |  Bin 490 -> 613 bytes
 framework/Exception/locale/fr/LC_MESSAGES/Horde_Exception.po      |   22 +-
 framework/Exception/package.xml                                   |    4 +-
 framework/Form/locale/fr/LC_MESSAGES/Horde_Form.mo                |  Bin 10484 -> 11239 bytes
 framework/Form/locale/fr/LC_MESSAGES/Horde_Form.po                |  377 +-
 framework/Form/package.xml                                        |    4 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |    6 +
 framework/Imap_Client/locale/fr/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 0 -> 7074 bytes
 framework/Imap_Client/locale/fr/LC_MESSAGES/Horde_Imap_Client.po  |  272 +
 framework/Imap_Client/package.xml                                 |   46 +-
 .../Imap_Client/test/Horde/Imap/Client/RemoteImapServerTest.php   |    7 +-
 framework/Imsp/locale/fr/LC_MESSAGES/Horde_Imsp.mo                |  Bin 631 -> 586 bytes
 framework/Imsp/locale/fr/LC_MESSAGES/Horde_Imsp.po                |   26 +-
 framework/Imsp/package.xml                                        |    4 +-
 framework/Itip/locale/fr/LC_MESSAGES/Horde_Itip.mo                |  Bin 421 -> 1475 bytes
 framework/Itip/locale/fr/LC_MESSAGES/Horde_Itip.po                |   45 +-
 framework/Itip/package.xml                                        |    4 +-
 framework/Mime/lib/Horde/Mime/Part.php                            |   12 +-
 framework/Mime/package.xml                                        |    2 +
 framework/Mime_Viewer/locale/fr/LC_MESSAGES/Horde_Mime_Viewer.mo  |  Bin 462 -> 1552 bytes
 framework/Mime_Viewer/locale/fr/LC_MESSAGES/Horde_Mime_Viewer.po  |   60 +-
 framework/Mime_Viewer/package.xml                                 |    4 +-
 framework/Model/locale/fr/LC_MESSAGES/Horde_Model.mo              |  Bin 10591 -> 7134 bytes
 framework/Model/locale/fr/LC_MESSAGES/Horde_Model.po              |  778 +-
 framework/Perms/locale/fr/LC_MESSAGES/Horde_Perms.mo              |  Bin 626 -> 873 bytes
 framework/Perms/locale/fr/LC_MESSAGES/Horde_Perms.po              |   37 +-
 framework/Perms/package.xml                                       |    4 +-
 framework/Prefs/locale/fr/LC_MESSAGES/Horde_Prefs.mo              |  Bin 899 -> 1135 bytes
 framework/Prefs/locale/fr/LC_MESSAGES/Horde_Prefs.po              |   45 +-
 framework/Prefs/package.xml                                       |    4 +-
 framework/Push/locale/fr/LC_MESSAGES/Horde_Push.mo                |  Bin 0 -> 1191 bytes
 framework/Push/locale/fr/LC_MESSAGES/Horde_Push.po                |   45 +
 framework/Push/package.xml                                        |    2 +
 framework/Rpc/locale/fr/LC_MESSAGES/Horde_Rpc.mo                  |  Bin 1209 -> 1577 bytes
 framework/Rpc/locale/fr/LC_MESSAGES/Horde_Rpc.po                  |   38 +-
 framework/Rpc/package.xml                                         |    4 +-
 .../locale/fr/LC_MESSAGES/Horde_Service_Facebook.mo               |  Bin 433 -> 731 bytes
 .../locale/fr/LC_MESSAGES/Horde_Service_Facebook.po               |   28 +-
 framework/Service_Facebook/package.xml                            |    4 +-
 .../Service_Scribd/locale/fr/LC_MESSAGES/Horde_Service_Scribd.mo  |  Bin 431 -> 574 bytes
 .../Service_Scribd/locale/fr/LC_MESSAGES/Horde_Service_Scribd.po  |   26 +-
 framework/Service_Scribd/package.xml                              |    1 +
 .../locale/fr/LC_MESSAGES/Horde_Service_Weather.mo                |  Bin 0 -> 11946 bytes
 .../locale/fr/LC_MESSAGES/Horde_Service_Weather.po                |  870 ++
 framework/Service_Weather/package.xml                             |    4 +-
 framework/SyncMl/locale/fr/LC_MESSAGES/Horde_SyncMl.mo            |  Bin 423 -> 596 bytes
 framework/SyncMl/locale/fr/LC_MESSAGES/Horde_SyncMl.po            |   20 +-
 framework/Token/locale/fr/LC_MESSAGES/Horde_Token.mo              |  Bin 422 -> 1316 bytes
 framework/Token/locale/fr/LC_MESSAGES/Horde_Token.po              |   36 +-
 framework/Token/package.xml                                       |    4 +-
 framework/Vfs/locale/fr/LC_MESSAGES/Horde_Vfs.mo                  |  Bin 614 -> 696 bytes
 framework/Vfs/locale/fr/LC_MESSAGES/Horde_Vfs.po                  |   21 +-
 gollem/docs/CHANGES                                               |    2 +
 gollem/locale/fr/LC_MESSAGES/gollem.mo                            |  Bin 82797 -> 74583 bytes
 gollem/locale/fr/LC_MESSAGES/gollem.po                            |  524 +-
 gollem/package.xml                                                |    4 +-
 horde/docs/CHANGES                                                |    2 +
 horde/docs/CREDITS                                                |    2 +
 horde/locale/fr/LC_MESSAGES/horde.mo                              |  Bin 73560 -> 66503 bytes
 horde/locale/fr/LC_MESSAGES/horde.po                              | 2199 ++--
 horde/package.xml                                                 |    4 +-
 imp/docs/CREDITS                                                  |    2 +
 imp/locale/fr/LC_MESSAGES/imp.mo                                  |  Bin 190052 -> 183777 bytes
 imp/locale/fr/LC_MESSAGES/imp.po                                  |  752 +-
 ingo/docs/CHANGES                                                 |    2 +
 ingo/docs/CREDITS                                                 |    2 +
 ingo/locale/fr/LC_MESSAGES/ingo.mo                                |  Bin 91641 -> 85790 bytes
 ingo/locale/fr/LC_MESSAGES/ingo.po                                |  570 +-
 ingo/package.xml                                                  |    4 +-
 jonah/locale/fr/LC_MESSAGES/jonah.mo                              |  Bin 78828 -> 71639 bytes
 kolab/locale/fr/LC_MESSAGES/kolab.mo                              |  Bin 0 -> 66670 bytes
 kolab/locale/fr/LC_MESSAGES/kolab.po                              |   36 +
 kronolith/docs/CHANGES                                            |    2 +
 kronolith/docs/CREDITS                                            |    2 +
 kronolith/locale/fr/LC_MESSAGES/kronolith.mo                      |  Bin 135930 -> 128581 bytes
 kronolith/locale/fr/LC_MESSAGES/kronolith.po                      | 1976 ++--
 kronolith/package.xml                                             |    2 +
 mnemo/docs/CHANGES                                                |    2 +
 mnemo/docs/CREDITS                                                |    2 +
 mnemo/locale/fr/LC_MESSAGES/mnemo.mo                              |  Bin 83949 -> 76224 bytes
 mnemo/locale/fr/LC_MESSAGES/mnemo.po                              |  364 +-
 mnemo/package.xml                                                 |    2 +
 nag/docs/CHANGES                                                  |    2 +
 nag/docs/CREDITS                                                  |    2 +
 nag/locale/fr/LC_MESSAGES/nag.mo                                  |  Bin 98703 -> 92463 bytes
 nag/locale/fr/LC_MESSAGES/nag.po                                  | 1007 +-
 nag/package.xml                                                   |    4 +-
 passwd/docs/CHANGES                                               |    2 +
 passwd/docs/CREDITS                                               |    2 +
 passwd/locale/fr/LC_MESSAGES/passwd.mo                            |  Bin 79698 -> 72725 bytes
 passwd/locale/fr/LC_MESSAGES/passwd.po                            |  326 +-
 passwd/package.xml                                                |    1 +
 sam/locale/fr/LC_MESSAGES/sam.mo                                  |  Bin 75889 -> 68793 bytes
 timeobjects/docs/CHANGES                                          |    2 +
 timeobjects/locale/fr/LC_MESSAGES/timeobjects.mo                  |  Bin 0 -> 67043 bytes
 timeobjects/locale/fr/LC_MESSAGES/timeobjects.po                  |   73 +
 timeobjects/package.xml                                           |    4 +-
 trean/locale/fr/LC_MESSAGES/trean.mo                              |  Bin 79099 -> 71991 bytes
 turba/docs/CHANGES                                                |    2 +
 turba/docs/CREDITS                                                |    2 +
 turba/locale/fr/LC_MESSAGES/turba.mo                              |  Bin 105492 -> 98535 bytes
 turba/locale/fr/LC_MESSAGES/turba.po                              |  136 +-
 turba/package.xml                                                 |    2 +
 whups/locale/fr/LC_MESSAGES/whups.mo                              |  Bin 108777 -> 101691 bytes
 138 files changed, 7768 insertions(+), 7848 deletions(-)

http://git.horde.org/horde-git/-/commit/52c4119e09c36f279e3e5c3fdff6f0101a6e6e57

-----------------------------------------------------------------------

commit 263d99ab87779f1d44b8d05204adbc818a659eca
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 16:29:23 2013 -0700

    Fix parsing msgload parameter

 imp/lib/Ajax/Application.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/263d99ab87779f1d44b8d05204adbc818a659eca

-----------------------------------------------------------------------

commit 010bb0ae43974963fbb0fd6cb5630cb5692b0b67
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 16:30:01 2013 -0700

    [mms] Save AJAX showMessage call when reloading the dynamic mailbox page with a message preview active.

 imp/docs/CHANGES   |    2 ++
 imp/js/dimpbase.js |   13 ++++++++-----
 imp/package.xml    |    2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/010bb0ae43974963fbb0fd6cb5630cb5692b0b67

-----------------------------------------------------------------------

commit a09e914d96f52555fb8b1173b9d46e6fcff90595
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 16:38:17 2013 -0700

    Fix pre-buffering of unseen messages in dynamic view

 imp/js/dimpbase.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/a09e914d96f52555fb8b1173b9d46e6fcff90595

-----------------------------------------------------------------------

commit 947c9008b3b8714e3bb099e9b6a7883898a32730
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 17:41:01 2013 -0700

    Make sure there are not duplicate Ids

 imp/lib/Ajax/Application/Handler/Common.php |    1 -
 imp/lib/Indices.php                         |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/947c9008b3b8714e3bb099e9b6a7883898a32730

-----------------------------------------------------------------------

commit 035bfce43e4d0c72e871d5b5c5b075db1518d956
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 22:03:44 2013 -0700

    Fix selecting messages in mailbox view

 imp/js/mailbox.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/035bfce43e4d0c72e871d5b5c5b075db1518d956

-----------------------------------------------------------------------

commit acc01732dc85740c7b114b02b38eafc49ebb279f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 22:14:14 2013 -0700

    Get rid of IMP_Ui_Folders
    
    Move import/generate code out of IMP_Ui_Folders/IMP_Mailbox and into its
    own separate IMP_Mbox_* classes.

 imp/folders.php                              |    2 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php |    2 +-
 imp/lib/Application.php                      |    2 +-
 imp/lib/Mailbox.php                          |  148 -------------------
 imp/lib/Mbox/Generate.php                    |  151 +++++++++++++++++++
 imp/lib/Mbox/Import.php                      |  205 ++++++++++++++++++++++++++
 imp/lib/Ui/Folder.php                        |  168 ---------------------
 imp/package.xml                              |   10 +-
 8 files changed, 365 insertions(+), 323 deletions(-)
 create mode 100644 imp/lib/Mbox/Generate.php
 create mode 100644 imp/lib/Mbox/Import.php
 delete mode 100644 imp/lib/Ui/Folder.php

http://git.horde.org/horde-git/-/commit/acc01732dc85740c7b114b02b38eafc49ebb279f

-----------------------------------------------------------------------

commit 12de76b062dc00a981c5bc29371ced8438189d3f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 22:30:41 2013 -0700

    IMP_Ui_Imageview -> IMP_Images

 imp/lib/Images.php             |   78 ++++++++++++++++++++++++++++++++++++++++
 imp/lib/Mime/Viewer/Html.php   |    3 +-
 imp/lib/Mime/Viewer/Images.php |    3 +-
 imp/lib/Ui/Imageview.php       |   71 ------------------------------------
 imp/package.xml                |    6 ++--
 5 files changed, 83 insertions(+), 78 deletions(-)
 create mode 100644 imp/lib/Images.php
 delete mode 100644 imp/lib/Ui/Imageview.php

http://git.horde.org/horde-git/-/commit/12de76b062dc00a981c5bc29371ced8438189d3f

-----------------------------------------------------------------------

commit 59d45d6df184184b41aa36b61f9e11864c00392d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 22:32:05 2013 -0700

    IMP_Ui_Editor -> IMP_Editor

 imp/compose.php                         |    2 +-
 imp/lib/Dynamic/Compose/Common.php      |    2 +-
 imp/lib/Editor.php                      |   96 +++++++++++++++++++++++++++++++
 imp/lib/Prefs/Special/HtmlSignature.php |    2 +-
 imp/lib/Ui/Editor.php                   |   88 ----------------------------
 imp/package.xml                         |    6 +-
 6 files changed, 102 insertions(+), 94 deletions(-)
 create mode 100644 imp/lib/Editor.php
 delete mode 100644 imp/lib/Ui/Editor.php

http://git.horde.org/horde-git/-/commit/59d45d6df184184b41aa36b61f9e11864c00392d

-----------------------------------------------------------------------

commit 07a9b8b6ed3650f65e03ab11418b9121f57cf17c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 22:36:29 2013 -0700

    IMP_Ui_Headers -> IMP_Mime_Headers

 imp/lib/Compose.php                  |    5 +--
 imp/lib/Flag/System/HighPriority.php |    2 +-
 imp/lib/Flag/System/LowPriority.php  |    2 +-
 imp/lib/Mime/Headers.php             |   53 ++++++++++++++++++++++++++++++++++
 imp/lib/Minimal/Message.php          |    3 +-
 imp/lib/Ui/Headers.php               |   45 ----------------------------
 imp/message.php                      |    3 +-
 imp/package.xml                      |    6 ++--
 8 files changed, 61 insertions(+), 58 deletions(-)
 create mode 100644 imp/lib/Mime/Headers.php
 delete mode 100644 imp/lib/Ui/Headers.php

http://git.horde.org/horde-git/-/commit/07a9b8b6ed3650f65e03ab11418b9121f57cf17c

-----------------------------------------------------------------------

commit 72344b8860b2f556f3255c7443b5afe2f91c041f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 22:37:48 2013 -0700

    IMP_Ui_Contacts -> IMP_Contacts

 imp/contacts.php                             |    2 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php |    2 +-
 imp/lib/Ajax/Imple/ContactAutoCompleter.php  |    2 +-
 imp/lib/Contacts.php                         |   76 ++++++++++++++++++++++++++
 imp/lib/Crypt/Pgp.php                        |    6 +-
 imp/lib/Crypt/Smime.php                      |    6 +-
 imp/lib/Prefs/Special/Sourceselect.php       |    2 +-
 imp/lib/Ui/Contacts.php                      |   68 -----------------------
 imp/message.php                              |    2 +-
 imp/package.xml                              |    6 +-
 imp/thread.php                               |    2 +-
 11 files changed, 91 insertions(+), 83 deletions(-)
 create mode 100644 imp/lib/Contacts.php
 delete mode 100644 imp/lib/Ui/Contacts.php

http://git.horde.org/horde-git/-/commit/72344b8860b2f556f3255c7443b5afe2f91c041f

-----------------------------------------------------------------------

commit 74719b000a1014e38f31affa5245777e41f56170
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 22:49:20 2013 -0700

    Remove unneeded mode parameter to two hooks
    
    Not only was it using the obsolete 'imp' and 'dimp' identifiers, it is
    not needed since this info can be obtained via Horde_Registry#getView()

 imp/config/hooks.php.dist                 |   30 +++++++++++++---------------
 imp/docs/UPGRADING                        |    4 +++
 imp/lib/Ajax/Application/ListMessages.php |    4 +-
 imp/mailbox.php                           |    4 +-
 4 files changed, 22 insertions(+), 20 deletions(-)

http://git.horde.org/horde-git/-/commit/74719b000a1014e38f31affa5245777e41f56170

-----------------------------------------------------------------------

commit f7113a71e40665b050ac1423e3662d8fbe95933b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 22:58:44 2013 -0700

    Start moving basic view pages to separate view libraries
    
    First up - the contacts page

 imp/basic.php                      |   47 +++++++++++++
 imp/compose.php                    |    4 +-
 imp/contacts.php                   |  108 ------------------------------
 imp/js/contacts.js                 |    2 +-
 imp/lib/Basic/Base.php             |   84 +++++++++++++++++++++++
 imp/lib/Basic/Contacts.php         |  128 ++++++++++++++++++++++++++++++++++++
 imp/lib/Dynamic/Compose/Common.php |    2 +-
 imp/package.xml                    |   10 ++-
 8 files changed, 270 insertions(+), 115 deletions(-)
 create mode 100644 imp/basic.php
 delete mode 100644 imp/contacts.php
 create mode 100644 imp/lib/Basic/Base.php
 create mode 100644 imp/lib/Basic/Contacts.php

http://git.horde.org/horde-git/-/commit/f7113a71e40665b050ac1423e3662d8fbe95933b

-----------------------------------------------------------------------

commit da92c5978e9f80238dbc321cad9e7769bb162e84
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 23:13:43 2013 -0700

    Convert basic folders page to View library

 imp/folders.php           |  452 -------------------------------------------
 imp/js/folders.js         |    8 +-
 imp/lib/Application.php   |    2 +-
 imp/lib/Auth.php          |    2 +-
 imp/lib/Basic/Folders.php |  466 +++++++++++++++++++++++++++++++++++++++++++++
 imp/package.xml           |    6 +-
 6 files changed, 475 insertions(+), 461 deletions(-)
 delete mode 100644 imp/folders.php
 create mode 100644 imp/lib/Basic/Folders.php

http://git.horde.org/horde-git/-/commit/da92c5978e9f80238dbc321cad9e7769bb162e84

-----------------------------------------------------------------------

commit cddf1b27166c1807a8c7a7c5c9d592557b7e99e6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 23:30:44 2013 -0700

    Convert saveimage page to View library

 imp/lib/Basic/Saveimage.php |   90 +++++++++++++++++++++++++++++++++++++++++++
 imp/lib/Contents.php        |    2 +-
 imp/package.xml             |    8 ++--
 imp/saveimage.php           |   71 ----------------------------------
 4 files changed, 95 insertions(+), 76 deletions(-)
 create mode 100644 imp/lib/Basic/Saveimage.php
 delete mode 100644 imp/saveimage.php

http://git.horde.org/horde-git/-/commit/cddf1b27166c1807a8c7a7c5c9d592557b7e99e6

-----------------------------------------------------------------------

commit 278f3f9695c50f7fb0e2e6c31be352455c136938
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 22 23:35:55 2013 -0700

    Convert thread page to View library

 imp/basic.php                 |    8 +-
 imp/lib/Basic/Base.php        |    9 ++
 imp/lib/Basic/Thread.php      |  206 +++++++++++++++++++++++++++++++++++++++++
 imp/lib/Dynamic/Mailbox.php   |    2 +-
 imp/lib/Mime/Viewer/Plain.php |    4 +-
 imp/mailbox.php               |    2 +-
 imp/message.php               |    2 +-
 imp/package.xml               |    9 ++-
 imp/thread.php                |  195 --------------------------------------
 9 files changed, 230 insertions(+), 207 deletions(-)
 create mode 100644 imp/lib/Basic/Thread.php
 delete mode 100644 imp/thread.php

http://git.horde.org/horde-git/-/commit/278f3f9695c50f7fb0e2e6c31be352455c136938

-----------------------------------------------------------------------

commit 281650cd5cfe7cee21f3a3ee1f39b61756b42b7d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 00:00:04 2013 -0700

    These are not used anymore

 imp/lib/Mailbox/List.php         |   13 -------------
 imp/lib/Mailbox/List/Virtual.php |   10 ----------
 2 files changed, 0 insertions(+), 23 deletions(-)

http://git.horde.org/horde-git/-/commit/281650cd5cfe7cee21f3a3ee1f39b61756b42b7d

-----------------------------------------------------------------------

commit f88e530c50ccddb4e146b6cf6aad5507d46c38ab
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 00:21:09 2013 -0700

    Convert basic search page to View library

 imp/lib/Basic/Searchbasic.php |  131 +++++++++++++++++++++++++++++++++++++++++
 imp/mailbox.php               |    4 +-
 imp/search-basic.php          |  118 -------------------------------------
 imp/search.php                |   10 ++--
 4 files changed, 138 insertions(+), 125 deletions(-)
 create mode 100644 imp/lib/Basic/Searchbasic.php
 delete mode 100644 imp/search-basic.php

http://git.horde.org/horde-git/-/commit/f88e530c50ccddb4e146b6cf6aad5507d46c38ab

-----------------------------------------------------------------------

commit eeae092e9c0c72e651b8c90a0512b942a33c6521
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 01:19:27 2013 -0700

    Convert advanced search page to View library

 imp/js/search.js                            |    8 +-
 imp/lib/Ajax/Application/Handler/Search.php |    2 +-
 imp/lib/Application.php                     |    4 +-
 imp/lib/Basic/Base.php                      |    2 +-
 imp/lib/Basic/Folders.php                   |    4 +-
 imp/lib/Basic/Search.php                    |  525 +++++++++++++++++++++++++++
 imp/lib/Basic/Searchbasic.php               |    2 +-
 imp/lib/Dynamic/Mailbox.php                 |    2 +-
 imp/lib/IMP.php                             |    2 +-
 imp/lib/Mailbox.php                         |   30 +-
 imp/lib/Search.php                          |    2 +-
 imp/lib/Search/Ui.php                       |   68 ++++
 imp/lib/Ui/Search.php                       |   60 ---
 imp/package.xml                             |   19 +-
 imp/search.php                              |  512 --------------------------
 imp/templates/search/search.html.php        |    2 +-
 16 files changed, 629 insertions(+), 615 deletions(-)
 create mode 100644 imp/lib/Basic/Search.php
 create mode 100644 imp/lib/Search/Ui.php
 delete mode 100644 imp/lib/Ui/Search.php
 delete mode 100644 imp/search.php

http://git.horde.org/horde-git/-/commit/eeae092e9c0c72e651b8c90a0512b942a33c6521

-----------------------------------------------------------------------

commit 8523580a72da7ac07a59487078857057541c3ef9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 03:01:35 2013 -0700

    Convert compose page to View library

 imp/compose.php                               | 1067 -----------------------
 imp/js/compose.js                             |    4 +-
 imp/lib/Ajax/Application/Handler/Common.php   |    2 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php  |    4 +-
 imp/lib/Api.php                               |    8 +-
 imp/lib/Basic/Compose.php                     | 1137 ++++++++++++++++++++++++-
 imp/lib/Compose/Ui.php                        |  146 ++++
 imp/lib/Dynamic/Compose.php                   |    2 +-
 imp/lib/Dynamic/Compose/Common.php            |    2 +-
 imp/lib/Dynamic/Message.php                   |    2 +-
 imp/lib/IMP.php                               |    6 +-
 imp/lib/Prefs/Special/Mailto.php              |    2 +-
 imp/lib/Ui/Compose.php                        |  197 -----
 imp/mailbox.php                               |    4 +-
 imp/package.xml                               |    8 +-
 imp/templates/basic/compose/compose.html.php  |    2 -
 imp/templates/basic/compose/redirect.html.php |    2 -
 17 files changed, 1287 insertions(+), 1308 deletions(-)
 delete mode 100644 imp/compose.php
 create mode 100644 imp/lib/Compose/Ui.php
 delete mode 100644 imp/lib/Ui/Compose.php

http://git.horde.org/horde-git/-/commit/8523580a72da7ac07a59487078857057541c3ef9

-----------------------------------------------------------------------

commit d3ed0e52fbd0f7ba1072d1435aa5cd8031b61eca
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 13:18:10 2013 -0700

    IMP_Ui_Quota -> IMP_Quota_Ui

 imp/lib/Ajax/Queue.php   |    2 +-
 imp/lib/Quota/Ui.php     |   84 ++++++++++++++++++++++++++++++++++++++++++++++
 imp/lib/Ui/Quota.php     |   76 -----------------------------------------
 imp/lib/View/Subinfo.php |    2 +-
 imp/package.xml          |    4 +-
 5 files changed, 88 insertions(+), 80 deletions(-)
 create mode 100644 imp/lib/Quota/Ui.php
 delete mode 100644 imp/lib/Ui/Quota.php

http://git.horde.org/horde-git/-/commit/d3ed0e52fbd0f7ba1072d1435aa5cd8031b61eca

-----------------------------------------------------------------------

commit 26192f81c58952b2e9ceb5734f27db1c7d543110
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 13:49:26 2013 -0700

    This method is only used internally in one class

 imp/lib/Ajax/Application/ShowMessage.php |   12 ++++++++++--
 imp/lib/Ui/Message.php                   |   16 ----------------
 2 files changed, 10 insertions(+), 18 deletions(-)

http://git.horde.org/horde-git/-/commit/26192f81c58952b2e9ceb5734f27db1c7d543110

-----------------------------------------------------------------------

commit 7ba7a834c211fac6fc93593c7d7de1dac13a3691
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 13:50:04 2013 -0700

    Convert message page to View library

 imp/js/message.js                            |   18 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php |    3 +-
 imp/lib/Ajax/Application/ShowMessage.php     |    2 +-
 imp/lib/Basic/Message.php                    | 1007 ++++++++++++++++++++++++++
 imp/lib/Basic/Thread.php                     |    4 +-
 imp/lib/Block/Newmail.php                    |    2 +-
 imp/lib/Compose.php                          |   17 +-
 imp/lib/Contents/View.php                    |    3 +-
 imp/lib/Dynamic/Message.php                  |    2 +-
 imp/lib/Mailbox.php                          |    9 +
 imp/lib/Message/Ui.php                       |  341 +++++++++
 imp/lib/Mime/Viewer/Plain.php                |    3 +-
 imp/lib/Mime/Viewer/Rfc822.php               |    2 +-
 imp/lib/Minimal/Message.php                  |    2 +-
 imp/lib/Ui/Message.php                       |  390 ----------
 imp/mailbox.php                              |    4 +-
 imp/message.php                              |  928 ------------------------
 imp/package.xml                              |   12 +-
 imp/rss.php                                  |    4 +-
 19 files changed, 1394 insertions(+), 1359 deletions(-)
 create mode 100644 imp/lib/Basic/Message.php
 create mode 100644 imp/lib/Message/Ui.php
 delete mode 100644 imp/lib/Ui/Message.php
 delete mode 100644 imp/message.php

http://git.horde.org/horde-git/-/commit/7ba7a834c211fac6fc93593c7d7de1dac13a3691

-----------------------------------------------------------------------

commit d1945ed6e8676bcaeec3262775f5615a691ad7de
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 14:12:45 2013 -0700

    Convert mailbox page to View library

 imp/config/hooks.php.dist                 |    2 +-
 imp/js/mailbox.js                         |   23 +-
 imp/lib/Ajax/Application/ListMessages.php |    2 +-
 imp/lib/Application.php                   |    5 +-
 imp/lib/Auth.php                          |   10 +-
 imp/lib/Basic/Compose.php                 |    8 +-
 imp/lib/Basic/Folders.php                 |    2 +-
 imp/lib/Basic/Mailbox.php                 |  998 +++++++++++++++++++++++++++++
 imp/lib/Basic/Message.php                 |   28 +-
 imp/lib/Basic/Search.php                  |    4 +-
 imp/lib/Basic/Searchbasic.php             |    4 +-
 imp/lib/Basic/Thread.php                  |    6 +-
 imp/lib/Block/Newmail.php                 |    4 +-
 imp/lib/Block/Summary.php                 |    2 +-
 imp/lib/Contents/View.php                 |    4 +-
 imp/lib/Imap/Tree.php                     |    2 +-
 imp/lib/Mailbox.php                       |   58 +-
 imp/lib/Mailbox/Ui.php                    |  203 ++++++
 imp/lib/Minimal/Compose.php               |    2 +-
 imp/lib/Minimal/Mailbox.php               |    2 +-
 imp/lib/Minimal/Message.php               |    3 +-
 imp/lib/Prefs/Special/Searches.php        |    2 +-
 imp/lib/Ui/Mailbox.php                    |  195 ------
 imp/mailbox.php                           |  983 ----------------------------
 imp/rss.php                               |    2 +-
 25 files changed, 1290 insertions(+), 1264 deletions(-)
 create mode 100644 imp/lib/Basic/Mailbox.php
 create mode 100644 imp/lib/Mailbox/Ui.php
 delete mode 100644 imp/lib/Ui/Mailbox.php
 delete mode 100644 imp/mailbox.php

http://git.horde.org/horde-git/-/commit/d1945ed6e8676bcaeec3262775f5615a691ad7de

-----------------------------------------------------------------------

commit f14846bfea5ed193d26a7284da740b8751ad66ec
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 15:51:07 2013 -0700

    Cleanup getInitialPage() usage

 imp/index.php    |   12 +-----------
 imp/lib/Auth.php |   19 +++----------------
 2 files changed, 4 insertions(+), 27 deletions(-)

http://git.horde.org/horde-git/-/commit/f14846bfea5ed193d26a7284da740b8751ad66ec

-----------------------------------------------------------------------

commit bf695444783b0d91b483fe3410d44cc163dbb2e4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 16:15:41 2013 -0700

    Convert pgp page to View library

 imp/lib/Basic/Pgp.php                   |  221 +++++++++++++++++++++++++++++++
 imp/lib/Crypt/Pgp.php                   |   90 -------------
 imp/lib/Prefs/Special/PgpPrivateKey.php |    2 +-
 imp/lib/Prefs/Special/PgpPublicKey.php  |    2 +-
 imp/package.xml                         |   16 +--
 imp/pgp.php                             |  111 ----------------
 6 files changed, 230 insertions(+), 212 deletions(-)
 create mode 100644 imp/lib/Basic/Pgp.php
 delete mode 100644 imp/pgp.php

http://git.horde.org/horde-git/-/commit/bf695444783b0d91b483fe3410d44cc163dbb2e4

-----------------------------------------------------------------------

commit 10baf8785607988e4b669c292b849e0a6d452365
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 16:27:54 2013 -0700

    Convert smime page to View library

 imp/lib/Basic/Smime.php                   |  218 +++++++++++++++++++++++++++++
 imp/lib/Crypt/Smime.php                   |  108 --------------
 imp/lib/Prefs/Special/SmimePrivateKey.php |    2 +-
 imp/lib/Prefs/Special/SmimePublicKey.php  |    2 +-
 imp/package.xml                           |    6 +-
 imp/smime.php                             |  102 --------------
 6 files changed, 223 insertions(+), 215 deletions(-)
 create mode 100644 imp/lib/Basic/Smime.php
 delete mode 100644 imp/smime.php

http://git.horde.org/horde-git/-/commit/10baf8785607988e4b669c292b849e0a6d452365

-----------------------------------------------------------------------

commit 362f8b26c41a20da739a00189d5f10f3b52796aa
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 16:28:12 2013 -0700

    IMP::header() no longer needed

 imp/lib/IMP.php |   53 -----------------------------------------------------
 1 files changed, 0 insertions(+), 53 deletions(-)

http://git.horde.org/horde-git/-/commit/362f8b26c41a20da739a00189d5f10f3b52796aa

-----------------------------------------------------------------------

commit bfc25c1281614c80983d3370b65f6664dd861465
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 16:29:11 2013 -0700

    [mms] All basic view pages are now routed through the basic.php endpoint.

 imp/docs/CHANGES |    1 +
 imp/package.xml  |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/bfc25c1281614c80983d3370b65f6664dd861465

-----------------------------------------------------------------------

commit 89250b88024299f4f9b78035a7c1d10b4cc33609
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 17:32:00 2013 -0700

    More cleanup of index mailbox tracking
    
    Don't store this in serialized object.  The HTML state data should be
    appropriate to allow tracking (and allows multiple windows to be
    accessing mailboxes at the same time).

 imp/lib/Basic/Message.php   |    2 +-
 imp/lib/Mailbox/List.php    |   44 +++++++-----------------------------------
 imp/lib/Minimal/Message.php |    2 +-
 3 files changed, 10 insertions(+), 38 deletions(-)

http://git.horde.org/horde-git/-/commit/89250b88024299f4f9b78035a7c1d10b4cc33609

-----------------------------------------------------------------------

commit 8dae68007144bbb334605766c62f319763b56989
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 20:39:37 2013 -0700

    Fix typo

 imp/lib/Mbox/Generate.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8dae68007144bbb334605766c62f319763b56989

-----------------------------------------------------------------------

commit 5c04f924bd3896055ea81c3dd1c8927db886899a
Merge: 8dae680 a44477c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 23 23:42:27 2013 -0700

    Merge branch 'master' into imp_6_1

 .gitattributes                                              |    7 -
 .gitignore                                                  |   39 +--
 ansel/config/conf.xml                                       |    5 -
 ansel/js/widgets/geotag.js                                  |    6 +-
 ansel/lib/Ajax/Application/Handler.php                      |   20 +-
 ansel/lib/Ansel.php                                         |   19 ++
 ansel/lib/Application.php                                   |   65 ++--
 ansel/lib/View/Upload.php                                   |   32 ++-
 ansel/lib/Widget/Geotag.php                                 |  180 ++++-------
 ansel/map_edit.php                                          |  126 ++------
 ansel/templates/image/plupload.inc                          |    2 +-
 ansel/templates/map_edit.html.php                           |   37 +++
 ansel/templates/widgets/actions.html.php                    |    4 +-
 ansel/templates/widgets/geotag.html.php                     |   30 ++
 ansel/themes/default/graphics/add.png                       |  Bin 496 -> 0 bytes
 ansel/themes/default/graphics/allgalleries.png              |  Bin 0 -> 646 bytes
 ansel/themes/default/graphics/ansel.png                     |  Bin 493 -> 454 bytes
 ansel/themes/default/graphics/arrow_switch.png              |  Bin 650 -> 680 bytes
 ansel/themes/default/graphics/bookmark.png                  |  Bin 0 -> 292 bytes
 ansel/themes/default/graphics/browse.png                    |  Bin 492 -> 578 bytes
 ansel/themes/default/graphics/down.png                      |  Bin 241 -> 384 bytes
 ansel/themes/default/graphics/faces.png                     |  Bin 0 -> 609 bytes
 ansel/themes/default/graphics/favicon.ico                   |  Bin 1386 -> 1742 bytes
 ansel/themes/default/graphics/galleries.png                 |  Bin 492 -> 454 bytes
 ansel/themes/default/graphics/image_add.png                 |  Bin 208 -> 0 bytes
 ansel/themes/default/graphics/mygalleries.png               |  Bin 492 -> 454 bytes
 ansel/themes/default/graphics/photomarker-shadow.png        |  Bin 0 -> 947 bytes
 ansel/themes/default/graphics/photomarker.png               |  Bin 0 -> 598 bytes
 ansel/themes/default/graphics/plus.png                      |  Bin 0 -> 626 bytes
 ansel/themes/default/graphics/problem.png                   |  Bin 124 -> 591 bytes
 ansel/themes/default/graphics/slideshow_next.png            |  Bin 255 -> 451 bytes
 ansel/themes/default/graphics/slideshow_pause.png           |  Bin 259 -> 222 bytes
 ansel/themes/default/graphics/slideshow_play.png            |  Bin 234 -> 345 bytes
 ansel/themes/default/graphics/slideshow_prev.png            |  Bin 264 -> 451 bytes
 ansel/themes/default/graphics/success.png                   |  Bin 336 -> 0 bytes
 ansel/themes/default/graphics/text.png                      |  Bin 104 -> 4109 bytes
 ansel/themes/default/graphics/twitter.png                   |  Bin 493 -> 0 bytes
 ansel/themes/default/graphics/up.png                        |  Bin 244 -> 370 bytes
 ansel/themes/default/screen.css                             |   18 +-
 framework/ActiveSync/lib/Horde/ActiveSync.php               |    4 +-
 framework/Form/lib/Horde/Form/Type.php                      |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php        |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php      |   56 ++--
 framework/Imap_Client/package.xml                           |    4 +-
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php |   11 +-
 framework/Support/lib/Horde/Support/Randomid.php            |    4 +-
 framework/Support/package.xml                               |    4 +-
 horde/js/plupload/uploader.js                               |   26 +-
 horde/themes/default/graphics/map/marker-blue.png           |  Bin 714 -> 0 bytes
 horde/themes/default/graphics/map/marker-gold.png           |  Bin 651 -> 0 bytes
 horde/themes/default/graphics/map/marker-green.png          |  Bin 702 -> 0 bytes
 horde/themes/default/graphics/mime/compressed.png           |  Bin 672 -> 732 bytes
 horde/themes/default/graphics/uploader/backgrounds.gif      |  Bin 2977 -> 0 bytes
 horde/themes/default/graphics/uploader/up.png               |  Bin 480 -> 0 bytes
 horde/themes/default/screen.css                             |   26 +-
 ingo/docs/CHANGES                                           |    2 +
 ingo/lib/Form/Vacation.php                                  |    4 +-
 ingo/package.xml                                            |    2 +
 kronolith/js/kronolith.js                                   |   18 +-
 kronolith/lib/Ajax.php                                      |    1 +
 60 files changed, 361 insertions(+), 395 deletions(-)

http://git.horde.org/horde-git/-/commit/5c04f924bd3896055ea81c3dd1c8927db886899a

-----------------------------------------------------------------------

commit 985673141a2978e750d3642694fd92f1ff95cc53
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Jan 24 00:15:47 2013 -0700

    IMP::canCompose() -> IMP_Compose::canCompose()

 imp/lib/Ajax/Application/Handler/Common.php |    2 +-
 imp/lib/Application.php                     |    4 ++--
 imp/lib/Basic/Compose.php                   |    2 +-
 imp/lib/Basic/Mailbox.php                   |    2 +-
 imp/lib/Basic/Message.php                   |    2 +-
 imp/lib/Compose.php                         |   15 +++++++++++++++
 imp/lib/Dynamic/Base.php                    |    2 +-
 imp/lib/Dynamic/Compose/Common.php          |    2 +-
 imp/lib/Dynamic/Message.php                 |    2 +-
 imp/lib/IMP.php                             |   15 ---------------
 imp/lib/Minimal/Base.php                    |    3 ++-
 imp/lib/Minimal/Compose.php                 |    2 +-
 imp/lib/Minimal/Message.php                 |    2 +-
 imp/lib/Smartmobile.php                     |    8 ++++----
 14 files changed, 32 insertions(+), 31 deletions(-)

http://git.horde.org/horde-git/-/commit/985673141a2978e750d3642694fd92f1ff95cc53

-----------------------------------------------------------------------

commit 1d1c2904b6698f5fa3218af3242203476a6530da
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Jan 24 00:21:01 2013 -0700

    IMP::applyFilters() -> IMP_Filter::canApplyFilters()

 imp/config/prefs.php        |    6 +++---
 imp/lib/Basic/Mailbox.php   |    2 +-
 imp/lib/Dynamic/Mailbox.php |    2 +-
 imp/lib/Filter.php          |   24 +++++++++++++++++++++++-
 imp/lib/IMP.php             |   20 --------------------
 5 files changed, 28 insertions(+), 26 deletions(-)

http://git.horde.org/horde-git/-/commit/1d1c2904b6698f5fa3218af3242203476a6530da

-----------------------------------------------------------------------

commit 25aed8f7727726fde13ad0d382516ebaf546daf1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Jan 24 18:21:16 2013 -0700

    Move CKEditor paste/drag code to a separate plugin

 imp/js/ckeditor/paste.js               |   24 ++++++++++++++++++++++++
 imp/js/compose-base.js                 |   20 --------------------
 imp/lib/Script/Package/ComposeBase.php |   12 ++++++++++++
 imp/package.xml                        |    8 ++++++--
 4 files changed, 42 insertions(+), 22 deletions(-)
 create mode 100644 imp/js/ckeditor/paste.js

http://git.horde.org/horde-git/-/commit/25aed8f7727726fde13ad0d382516ebaf546daf1

-----------------------------------------------------------------------

commit 152b3f7132337b6896663bc2adfcb3910bd8fab5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 25 11:06:58 2013 -0700

    Fixes for view library conversion

 imp/lib/Basic/Compose.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/152b3f7132337b6896663bc2adfcb3910bd8fab5

-----------------------------------------------------------------------

commit b9fda61739742b232462f0a92f1ec21edebdbb94
Merge: 152b3f7 2204354
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 25 11:39:11 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 .gitattributes                                                    |    9 +
 .travis.yml                                                       |    1 +
 ansel/config/conf.xml                                             |    7 -
 ansel/image.php                                                   |   27 +-
 ansel/js/resizeimage.js                                           |   12 +
 ansel/lib/Block/RecentlyAddedGeodata.php                          |   55 +-
 ansel/lib/Image.php                                               |    4 +-
 ansel/lib/Tile/DateGallery.php                                    |   78 +-
 ansel/lib/Tile/Gallery.php                                        |  114 +-
 ansel/lib/Tile/Image.php                                          |  133 ++-
 ansel/lib/View/Image.php                                          |  303 +++--
 ansel/lib/View/Slideshow.php                                      |    4 +
 ansel/lib/Widget/Geotag.php                                       |    2 +-
 ansel/package.xml                                                 |   50 +-
 ansel/templates/image/crop_image.inc                              |    6 +-
 ansel/templates/image/resize_image.inc                            |   39 +-
 ansel/templates/tile/dategallery.html.php                         |    4 +
 ansel/templates/tile/dategallery.inc                              |    4 -
 ansel/templates/tile/gallery.html.php                             |   16 +
 ansel/templates/tile/gallery.inc                                  |   14 -
 ansel/templates/tile/gallerymini.html.php                         |    6 +
 ansel/templates/tile/gallerymini.inc                              |    4 -
 ansel/templates/tile/image.html.php                               |   27 +
 ansel/templates/tile/image.inc                                    |   27 -
 ansel/templates/view/image.inc                                    |    6 +-
 ansel/templates/view/slideshow.inc                                |    4 -
 ansel/templates/widgets/actions.html.php                          |    4 +-
 ansel/themes/default/cropper.css                                  |    4 +-
 ansel/themes/default/graphics/add.png                             |  Bin 0 -> 4687 bytes
 ansel/themes/default/graphics/allgalleries.png                    |  Bin 646 -> 4948 bytes
 ansel/themes/default/graphics/galleries.png                       |  Bin 454 -> 4817 bytes
 ansel/themes/default/graphics/marqueeHoriz.gif                    |  Bin 0 -> 1125 bytes
 ansel/themes/default/graphics/marqueeVert.gif                     |  Bin 0 -> 1141 bytes
 ansel/themes/default/screen.css                                   |   16 +-
 framework/Alarm/lib/Horde/Alarm/Handler/Desktop.php               |    2 +-
 framework/Alarm/lib/Horde/Alarm/Sql.php                           |    8 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/InPlaceEditor.php        |    7 +-
 framework/Icalendar/lib/Horde/Icalendar.php                       |    1 -
 framework/Icalendar/lib/Horde/Icalendar/Vevent.php                |   14 +-
 framework/Icalendar/package.xml                                   |    2 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/escapes2.ics    |    1 -
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-1.ics    |    2 -
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-2.ics    |    2 -
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-3.ics    |    2 -
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-4.ics    |    2 -
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-5.ics    |    2 -
 .../Icalendar/test/Horde/Icalendar/fixtures/line-folding-6.ics    |    2 -
 .../Icalendar/test/Horde/Icalendar/fixtures/quoted-params.ics     |    1 -
 framework/Image/lib/Horde/Image/Effect/Im/TextWatermark.php       |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/TextWatermark.php  |    2 +-
 framework/Image/package.xml                                       |    4 +-
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING             |    4 +
 framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Results.php     |   10 +
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |   90 +-
 .../Imap_Client/test/Horde/Imap/Client/RemoteImapServerTest.php   |   63 +-
 framework/Imap_Client/test/Horde/Imap/Client/Stub/Socket.php      |   16 +-
 framework/Imap_Client/test/Horde/Imap/Client/conf.php.dist        |    2 +
 framework/Support/lib/Horde/Support/Randomid.php                  |    3 +-
 horde/bin/horde-translation                                       |    4 +-
 imp/docs/CHANGES                                                  |    1 +
 imp/js/compose.js                                                 |    2 +
 imp/lib/Contents.php                                              |    3 +-
 imp/package.xml                                                   |    1 +
 ingo/config/backends.php                                          |   11 +-
 ingo/docs/CHANGES                                                 |    1 +
 ingo/package.xml                                                  |    2 +
 kronolith/docs/CHANGES                                            |    2 +
 kronolith/js/kronolith.js                                         |   14 +-
 kronolith/lib/Ajax.php                                            |    1 -
 kronolith/lib/Driver.php                                          |   84 ++-
 kronolith/lib/Driver/Ical.php                                     |   11 +-
 kronolith/lib/Driver/Kolab.php                                    |   18 +-
 kronolith/lib/Driver/Sql.php                                      |   57 +-
 kronolith/lib/Event.php                                           |    4 +-
 kronolith/package.xml                                             |    2 +
 nag/lib/Api.php                                                   |    1 +
 nag/lib/Driver/Kolab.php                                          |    5 +-
 77 files changed, 813 insertions(+), 635 deletions(-)

http://git.horde.org/horde-git/-/commit/b9fda61739742b232462f0a92f1ec21edebdbb94

-----------------------------------------------------------------------

commit 72c8c35c5d1499e8983b896f8f60ac08a5d3f5d9
Merge: b9fda61 5ac8499
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Jan 27 06:11:15 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 ansel/lib/Ansel.php                                           |    2 +-
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING         |   12 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Results.php |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php        |   40 +++++-
 framework/Imap_Client/package.xml                             |   12 +-
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php   |   66 ++++++++-
 framework/Imap_Client/test/Horde/Imap/Client/Stub/Socket.php  |   63 +++++---
 imp/docs/CHANGES                                              |    1 +
 imp/lib/Mime/Viewer/Itip.php                                  |    4 +-
 imp/package.xml                                               |    1 +
 10 files changed, 161 insertions(+), 42 deletions(-)

http://git.horde.org/horde-git/-/commit/72c8c35c5d1499e8983b896f8f60ac08a5d3f5d9

-----------------------------------------------------------------------

commit d4c6dcf73c66f2ed98e9c0925a1a13e383d5373c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 28 13:57:44 2013 -0700

    Move paste plugin -> pasteignore

 imp/js/ckeditor/paste.js               |   24 ------------------------
 imp/js/ckeditor/pasteignore.js         |   24 ++++++++++++++++++++++++
 imp/lib/Script/Package/ComposeBase.php |    6 +++---
 imp/package.xml                        |    8 ++++----
 4 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 imp/js/ckeditor/paste.js
 create mode 100644 imp/js/ckeditor/pasteignore.js

http://git.horde.org/horde-git/-/commit/d4c6dcf73c66f2ed98e9c0925a1a13e383d5373c

-----------------------------------------------------------------------

commit b0456ae8f75e08473afe25de94150490a7a46d64
Merge: d4c6dcf dfd72de
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 28 13:57:53 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Prefs/lib/Horde/Prefs/Identity.php |   20 +++++++-------------
 framework/Prefs/package.xml                  |   10 ++++++----
 imp/attachment.php                           |    9 ++-------
 imp/docs/INSTALL                             |   14 ++++----------
 imp/js/dimpbase.js                           |    4 ++--
 turba/config/attributes.php                  |   12 ++++++++++++
 turba/lib/Driver.php                         |    3 +++
 7 files changed, 36 insertions(+), 36 deletions(-)

http://git.horde.org/horde-git/-/commit/b0456ae8f75e08473afe25de94150490a7a46d64

-----------------------------------------------------------------------

commit 78de597a5c81ebf01988a72d9d10f6905763f835
Merge: b0456ae dcb58c8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 29 00:47:14 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Core/lib/Horde.php                           |    2 +-
 framework/Core/lib/Horde/Core/Mime/Viewer/Vcard.php    |    2 +-
 framework/Core/package.xml                             |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |    4 +-
 framework/Url/lib/Horde/Url/Data.php                   |   96 ++++++++++++++++
 framework/Url/package.xml                              |   22 ++--
 framework/Url/test/Horde/Url/UrlDataTest.php           |   68 +++++++++++
 imp/docs/RFCS                                          |    2 +-
 8 files changed, 183 insertions(+), 15 deletions(-)

http://git.horde.org/horde-git/-/commit/78de597a5c81ebf01988a72d9d10f6905763f835

-----------------------------------------------------------------------

commit 920191ee3b08cb076fd35061a7486faeaf828479
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 28 18:40:00 2013 -0700

    Additional check to ensure temporary compose files are deleted on logout

 imp/lib/Compose.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/920191ee3b08cb076fd35061a7486faeaf828479

-----------------------------------------------------------------------

commit 80d21fb2a5d369888c93425da423b372a2c558ca
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jan 28 14:12:33 2013 -0700

    Initial work in allowing pasting of data (images) into HTML editor
    
    For now, a drag/paste will simply add the data as an attachment.  Still
    need to (among other things):
    
      - Add HTML tag in editor to link to attachment data (compose attach
        preview)
      - Indicate that this data should not be a true attachment but rather
        data in a multipart/related part.
    
    This is only ever going to work in dynamic mode.  This is never going to
    be available in basic mode.

 imp/js/ckeditor/pasteattachment.js           |   73 ++++++++++++++++++++++++++
 imp/js/compose-dimp.js                       |    4 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php |   13 +++--
 imp/lib/Basic/Compose.php                    |    2 +-
 imp/lib/Compose.php                          |   67 +++++++++++++----------
 imp/lib/Minimal/Compose.php                  |    2 +-
 imp/lib/Script/Package/ComposeBase.php       |   18 +++++--
 imp/package.xml                              |    4 +-
 imp/templates/dynamic/compose.html.php       |    2 +-
 9 files changed, 141 insertions(+), 44 deletions(-)
 create mode 100644 imp/js/ckeditor/pasteattachment.js

http://git.horde.org/horde-git/-/commit/80d21fb2a5d369888c93425da423b372a2c558ca

-----------------------------------------------------------------------

commit df7e4d8741320179ffb29280392cd8eed1ad23cf
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 29 00:57:09 2013 -0700

    Fix regression removing setting of part type for attachments

 imp/lib/Compose.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/df7e4d8741320179ffb29280392cd8eed1ad23cf

-----------------------------------------------------------------------

commit 25e5a53f42010c854c4aad0a57782b37c08c4db0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jan 29 00:58:21 2013 -0700

    More succinct MIME Part labels

 imp/lib/Contents.php |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/25e5a53f42010c854c4aad0a57782b37c08c4db0

-----------------------------------------------------------------------

commit f5615cf28af7983766e78f0d928f3d08f6d5e3e7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 30 13:24:58 2013 -0700

    Added compose-cacheid AJAX task

 imp/js/compose-dimp.js                       |   52 +++++++++++++-------------
 imp/js/smartmobile.js                        |   21 +++-------
 imp/lib/Ajax/Application.php                 |    2 +
 imp/lib/Ajax/Application/Compose.php         |    1 -
 imp/lib/Ajax/Application/Handler/Common.php  |    4 --
 imp/lib/Ajax/Application/Handler/Dynamic.php |    4 +-
 imp/lib/Ajax/Queue.php                       |   26 +++++++++++++
 imp/lib/Dynamic/Compose.php                  |    6 ++-
 8 files changed, 67 insertions(+), 49 deletions(-)

http://git.horde.org/horde-git/-/commit/f5615cf28af7983766e78f0d928f3d08f6d5e3e7

-----------------------------------------------------------------------

commit a4c0092f680cadd6badce244519720d121f066e9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 30 13:49:18 2013 -0700

    Use Horde_Url_Data to generate attachment icon graphics

 imp/js/compose-dimp.js               |    4 ++--
 imp/lib/Ajax/Application/Compose.php |    5 ++++-
 imp/package.xml                      |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/a4c0092f680cadd6badce244519720d121f066e9

-----------------------------------------------------------------------

commit ceb78142c0d42b5c9fc30971f793081a4196bc8e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 30 14:06:05 2013 -0700

    Added compose-atc AJAX task

 imp/js/compose-dimp.js                       |   21 ++--------
 imp/lib/Ajax/Application/Compose.php         |   41 -------------------
 imp/lib/Ajax/Application/Handler/Common.php  |    4 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php |    9 +---
 imp/lib/Ajax/Queue.php                       |   54 ++++++++++++++++++++++++++
 imp/lib/Dynamic/Compose.php                  |    9 +++-
 imp/package.xml                              |    2 +-
 7 files changed, 71 insertions(+), 69 deletions(-)

http://git.horde.org/horde-git/-/commit/ceb78142c0d42b5c9fc30971f793081a4196bc8e

-----------------------------------------------------------------------

commit 5b82728caf08a243d4944f46b75830ebfc36b311
Merge: ceb7814 827a58b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 30 14:34:59 2013 -0700

    Merge branch 'master' into imp_6_1

 .travis.yml                                                       |    7 +
 agora/locale/de/LC_MESSAGES/agora.mo                              |  Bin 81321 -> 81281 bytes
 ansel/locale/ansel.pot                                            |  356 +-
 ansel/locale/de/LC_MESSAGES/ansel.mo                              |  Bin 106721 -> 106504 bytes
 ansel/locale/de/LC_MESSAGES/ansel.po                              |  364 +-
 beatnik/locale/beatnik.pot                                        |   32 +-
 chora/locale/de/LC_MESSAGES/chora.mo                              |  Bin 71461 -> 71421 bytes
 framework/ActiveSync/locale/Horde_ActiveSync.pot                  |   28 +-
 framework/ActiveSync/locale/de/LC_MESSAGES/Horde_ActiveSync.mo    |  Bin 1008 -> 1008 bytes
 framework/ActiveSync/locale/de/LC_MESSAGES/Horde_ActiveSync.po    |   28 +-
 framework/ActiveSync/package.xml                                  |   31 +-
 framework/Argv/package.xml                                        |   23 +-
 framework/Auth/package.xml                                        |   35 +-
 framework/Autoloader_Cache/package.xml                            |    1 +
 framework/Browser/locale/Horde_Browser.pot                        |   14 +-
 framework/Browser/locale/de/LC_MESSAGES/Horde_Browser.mo          |  Bin 1382 -> 1382 bytes
 framework/Browser/locale/de/LC_MESSAGES/Horde_Browser.po          |   14 +-
 framework/Cache/package.xml                                       |    2 +
 framework/Cli/package.xml                                         |   23 +-
 framework/Compress/locale/Horde_Compress.pot                      |    8 +-
 framework/Compress/locale/de/LC_MESSAGES/Horde_Compress.mo        |  Bin 939 -> 939 bytes
 framework/Compress/locale/de/LC_MESSAGES/Horde_Compress.po        |    8 +-
 framework/Compress/package.xml                                    |   23 +-
 framework/Core/lib/Horde/Core/Ajax/Application.php                |   11 +-
 framework/Core/locale/Horde_Core.pot                              |  200 +-
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.mo                |  Bin 19930 -> 19930 bytes
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.po                |  200 +-
 framework/Core/package.xml                                        |   26 +-
 framework/Crypt/package.xml                                       |   23 +-
 framework/Data/package.xml                                        |   23 +-
 framework/Date/locale/Horde_Date.pot                              |   14 +-
 framework/Date/locale/de/LC_MESSAGES/Horde_Date.mo                |  Bin 1126 -> 1126 bytes
 framework/Date/locale/de/LC_MESSAGES/Horde_Date.po                |   14 +-
 framework/Date/package.xml                                        |   25 +-
 framework/Db/package.xml                                          |   30 +-
 framework/Db/test/Horde/Db/Adapter/MissingTest.php                |   31 -
 framework/Db/test/Horde/Db/Adapter/Mysql/ColumnDefinition.php     |  121 +
 framework/Db/test/Horde/Db/Adapter/Mysql/ColumnDefinitionTest.php |  131 -
 framework/Db/test/Horde/Db/Adapter/Mysql/TableDefinition.php      |   76 +
 framework/Db/test/Horde/Db/Adapter/Mysql/TableDefinitionTest.php  |   86 -
 framework/Db/test/Horde/Db/Adapter/MysqlSuite.php                 |   90 -
 framework/Db/test/Horde/Db/Adapter/MysqlTest.php                  |  128 +-
 framework/Db/test/Horde/Db/Adapter/MysqliSuite.php                |   90 -
 framework/Db/test/Horde/Db/Adapter/MysqliTest.php                 |  128 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php             |   90 -
 framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php              |  129 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlBase.php              |   76 +
 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php             |   94 -
 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php              |    8 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/SqliteBase.php             |   65 +
 framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php            |   80 -
 framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php             |   12 +-
 .../Db/test/Horde/Db/Adapter/Postgresql/ColumnDefinitionTest.php  |    7 +-
 framework/Db/test/Horde/Db/Adapter/Postgresql/ColumnTest.php      |    2 +-
 .../Db/test/Horde/Db/Adapter/Postgresql/TableDefinitionTest.php   |    7 +-
 .../Db/test/Horde/Db/Adapter/Sqlite/ColumnDefinitionTest.php      |    7 +-
 framework/Db/test/Horde/Db/Adapter/Sqlite/ColumnTest.php          |    2 +-
 framework/Db/test/Horde/Db/Adapter/Sqlite/TableDefinitionTest.php |    7 +-
 framework/Db/test/Horde/Db/Migration/MigratorTest.php             |    2 +-
 framework/Editor/package.xml                                      |   23 +-
 framework/Form/lib/Horde/Form/Type.php                            |   30 +-
 framework/Form/locale/Horde_Form.pot                              |  344 +-
 framework/Form/locale/de/LC_MESSAGES/Horde_Form.mo                |  Bin 10966 -> 10966 bytes
 framework/Form/locale/de/LC_MESSAGES/Horde_Form.po                |  344 +-
 framework/Form/package.xml                                        |   23 +-
 framework/Group/package.xml                                       |   10 +-
 framework/Group/test/Horde/Group/Base.php                         |  141 -
 framework/Group/test/Horde/Group/LdapTest.php                     |    7 +-
 framework/Group/test/Horde/Group/MockTest.php                     |    7 +-
 framework/Group/test/Horde/Group/Sql/Base.php                     |    7 +-
 framework/Group/test/Horde/Group/TestBase.php                     |  141 +
 framework/Icalendar/locale/Horde_Icalendar.pot                    |    4 +-
 framework/Icalendar/locale/de/LC_MESSAGES/Horde_Icalendar.mo      |  Bin 503 -> 503 bytes
 framework/Icalendar/locale/de/LC_MESSAGES/Horde_Icalendar.po      |    4 +-
 framework/Icalendar/package.xml                                   |   24 +-
 framework/Image/package.xml                                       |   23 +-
 framework/Imap_Client/locale/Horde_Imap_Client.pot                |  136 +-
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 7138 -> 7305 bytes
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.po  |  138 +-
 framework/Imsp/package.xml                                        |   23 +-
 framework/Itip/package.xml                                        |   23 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php         |    2 +-
 framework/Kolab_Config/package.xml                                |    4 +
 framework/Kolab_Filter/package.xml                                |    4 +
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/DateTime.php     |    3 +
 framework/Kolab_Format/test/Horde/Kolab/Format/Stub/Log.php       |    2 +-
 .../test/Horde/Kolab/Format/Unit/Decorator/MemoryTest.php         |    2 +-
 .../test/Horde/Kolab/Format/Unit/Decorator/TimedTest.php          |    2 +-
 framework/Ldap/package.xml                                        |   21 +-
 framework/Memcache/package.xml                                    |    1 +
 framework/Mime/package.xml                                        |   31 +-
 framework/Mime_Viewer/package.xml                                 |   23 +-
 framework/Nls/package.xml                                         |    1 +
 framework/Perms/package.xml                                       |   23 +-
 framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php                  |  424 +-
 framework/Prefs/package.xml                                       |   24 +-
 framework/Push/test/Horde/Push/TestCase.php                       |    2 +-
 framework/Rdo/package.xml                                         |   10 +-
 framework/Rdo/test/Horde/Rdo/Base.php                             |   14 -
 framework/Rdo/test/Horde/Rdo/Sql/Base.php                         |    7 +-
 framework/Rdo/test/Horde/Rdo/TestBase.php                         |   14 +
 framework/Rpc/locale/Horde_Rpc.pot                                |    4 +-
 framework/Rpc/locale/de/LC_MESSAGES/Horde_Rpc.mo                  |  Bin 1546 -> 1546 bytes
 framework/Rpc/locale/de/LC_MESSAGES/Horde_Rpc.po                  |    4 +-
 framework/Rpc/package.xml                                         |   23 +-
 framework/Serialize/package.xml                                   |    1 +
 framework/Service_Facebook/package.xml                            |   23 +-
 framework/Service_Weather/locale/Horde_Service_Weather.pot        |   14 +-
 .../locale/de/LC_MESSAGES/Horde_Service_Weather.mo                |  Bin 12010 -> 12010 bytes
 .../locale/de/LC_MESSAGES/Horde_Service_Weather.po                |   14 +-
 framework/Service_Weather/package.xml                             |   33 +-
 .../Service_Weather/test/Horde/Service/Weather/GoogleTest.php     |  148 -
 framework/Share/package.xml                                       |   10 +-
 framework/Share/test/Horde/Share/Base.php                         |  613 --
 framework/Share/test/Horde/Share/Kolab/MockTest.php               |    9 +-
 framework/Share/test/Horde/Share/Kolab/UnitTest.php               |   14 +-
 framework/Share/test/Horde/Share/Sql/Base.php                     |    9 +-
 framework/Share/test/Horde/Share/Sqlng/Base.php                   |    9 +-
 framework/Share/test/Horde/Share/Stub/Group.php                   |    2 +-
 framework/Share/test/Horde/Share/TestBase.php                     |  613 ++
 framework/Support/package.xml                                     |   23 +-
 framework/Test/lib/Horde/Test/AllTests.php                        |   34 +-
 framework/Test/lib/Horde/Test/Autoload.php                        |   15 +-
 framework/Test/lib/Horde/Test/Bootstrap.php                       |   14 +-
 framework/Test/package.xml                                        |    8 +-
 framework/Text_Filter/locale/Horde_Text_Filter.pot                |    6 +-
 framework/Text_Filter/locale/de/LC_MESSAGES/Horde_Text_Filter.mo  |  Bin 476 -> 476 bytes
 framework/Text_Filter/locale/de/LC_MESSAGES/Horde_Text_Filter.po  |    6 +-
 framework/Timezone/package.xml                                    |   23 +-
 framework/Token/package.xml                                       |   23 +-
 framework/Url/package.xml                                         |   23 +-
 framework/Vcs/lib/Horde/Vcs/Patchset/Base.php                     |    4 +-
 framework/Vfs/locale/Horde_Vfs.pot                                |    8 +-
 framework/Vfs/locale/de/LC_MESSAGES/Horde_Vfs.mo                  |  Bin 631 -> 631 bytes
 framework/Vfs/locale/de/LC_MESSAGES/Horde_Vfs.po                  |    8 +-
 framework/Vfs/package.xml                                         |   11 +-
 framework/Vfs/test/Horde/Vfs/Base.php                             |  398 --
 framework/Vfs/test/Horde/Vfs/FileTest.php                         |    7 +-
 framework/Vfs/test/Horde/Vfs/FtpTest.php                          |    7 +-
 framework/Vfs/test/Horde/Vfs/SmbTest.php                          |    8 +-
 framework/Vfs/test/Horde/Vfs/Sql/Base.php                         |    7 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/Base.php                     |    7 +-
 framework/Vfs/test/Horde/Vfs/Ssh2Test.php                         |    7 +-
 framework/Vfs/test/Horde/Vfs/TestBase.php                         |  398 ++
 framework/bin/test_framework                                      |   32 +-
 gollem/locale/de/LC_MESSAGES/gollem.mo                            |  Bin 73933 -> 73418 bytes
 gollem/locale/de/LC_MESSAGES/gollem.po                            |  188 +-
 gollem/locale/gollem.pot                                          |  186 +-
 hermes/locale/de/LC_MESSAGES/hermes.mo                            |  Bin 79668 -> 79861 bytes
 hermes/locale/de/LC_MESSAGES/hermes.po                            |  266 +-
 hermes/locale/hermes.pot                                          |  256 +-
 horde/lib/Api.php                                                 |    4 +-
 horde/locale/de/LC_MESSAGES/horde.mo                              |  Bin 65325 -> 65285 bytes
 horde/locale/de/LC_MESSAGES/horde.po                              |  352 +-
 horde/locale/horde.pot                                            |  354 +-
 imp/locale/de/LC_MESSAGES/imp.mo                                  |  Bin 181625 -> 181519 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                  | 1565 +++--
 imp/locale/imp.pot                                                | 1561 ++--
 ingo/docs/CHANGES                                                 |    2 +-
 ingo/locale/de/LC_MESSAGES/ingo.mo                                |  Bin 84643 -> 84603 bytes
 ingo/locale/de/LC_MESSAGES/ingo.po                                |   28 +-
 ingo/locale/ingo.pot                                              |   30 +-
 ingo/package.xml                                                  |    2 +-
 jonah/locale/de/LC_MESSAGES/jonah.mo                              |  Bin 75235 -> 75179 bytes
 klutz/locale/de/LC_MESSAGES/klutz.mo                              |  Bin 70057 -> 69993 bytes
 kronolith/lib/Driver.php                                          |   12 +
 kronolith/lib/Driver/Sql.php                                      |   12 -
 kronolith/locale/de/LC_MESSAGES/kronolith.mo                      |  Bin 126080 -> 125921 bytes
 kronolith/locale/de/LC_MESSAGES/kronolith.po                      |  301 +-
 kronolith/locale/kronolith.pot                                    |  303 +-
 luxor/locale/de/LC_MESSAGES/luxor.mo                              |  Bin 67342 -> 67302 bytes
 mnemo/locale/de/LC_MESSAGES/mnemo.mo                              |  Bin 74891 -> 74851 bytes
 mnemo/locale/de/LC_MESSAGES/mnemo.po                              |   32 +-
 mnemo/locale/mnemo.pot                                            |   34 +-
 nag/locale/de/LC_MESSAGES/nag.mo                                  |  Bin 90841 -> 90801 bytes
 nag/locale/de/LC_MESSAGES/nag.po                                  |  166 +-
 nag/locale/nag.pot                                                |  168 +-
 passwd/locale/de/LC_MESSAGES/passwd.mo                            |  Bin 71275 -> 71235 bytes
 passwd/locale/de/LC_MESSAGES/passwd.po                            |   18 +-
 passwd/locale/passwd.pot                                          |   18 +-
 sam/locale/de/LC_MESSAGES/sam.mo                                  |  Bin 69415 -> 69335 bytes
 sesha/admin.php                                                   |    2 +-
 sesha/list.php                                                    |    2 +-
 sesha/locale/de/LC_MESSAGES/#sesha.po#                            |  536 ++
 sesha/locale/de/LC_MESSAGES/sesha.mo                              |  Bin 73964 -> 74072 bytes
 sesha/locale/de/LC_MESSAGES/sesha.po                              |  173 +-
 sesha/locale/sesha.pot                                            |  169 +-
 sesha/search.php                                                  |    2 +-
 sesha/stock.php                                                   |    2 +-
 skeleton/locale/skeleton.pot                                      |   60 +-
 timeobjects/locale/de/LC_MESSAGES/timeobjects.mo                  |  Bin 65862 -> 65822 bytes
 trean/lib/Application.php                                         |    6 -
 trean/locale/de/LC_MESSAGES/trean.mo                              |  Bin 69874 -> 69605 bytes
 trean/locale/de/LC_MESSAGES/trean.po                              |  115 +-
 trean/locale/trean.pot                                            |  113 +-
 turba/locale/de/LC_MESSAGES/turba.mo                              |  Bin 97100 -> 97175 bytes
 turba/locale/de/LC_MESSAGES/turba.po                              |  292 +-
 turba/locale/turba.pot                                            |  290 +-
 ulaform/locale/de/LC_MESSAGES/ulaform.mo                          |  Bin 71118 -> 71054 bytes
 vilma/locale/de/LC_MESSAGES/vilma.mo                              |  Bin 76741 -> 76701 bytes
 whups/locale/de/LC_MESSAGES/whups.mo                              |  Bin 107074 -> 107023 bytes
 whups/locale/de/LC_MESSAGES/whups.po                              |  414 +-
 whups/locale/whups.pot                                            |  410 +-
 wicked/locale/de/LC_MESSAGES/wicked.mo                            |  Bin 79796 -> 79732 bytes
 wicked/locale/de/LC_MESSAGES/wicked.po                            |   32 +-
 wicked/locale/wicked.pot                                          |   32 +-
 206 files changed, 8426 insertions(+), 7800 deletions(-)

http://git.horde.org/horde-git/-/commit/5b82728caf08a243d4944f46b75830ebfc36b311

-----------------------------------------------------------------------

commit b5e5b2d82d8cf047972694f83dcbdb3e5cc259e1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 30 15:07:22 2013 -0700

    Get better attachment filename for data without one (e.g. pasted data)

 imp/lib/Compose.php  |    9 ++++--
 imp/lib/Contents.php |   67 ++++++++++++++++++++++++++++++-------------------
 2 files changed, 47 insertions(+), 29 deletions(-)

http://git.horde.org/horde-git/-/commit/b5e5b2d82d8cf047972694f83dcbdb3e5cc259e1

-----------------------------------------------------------------------

commit e73a1bd0981228ffb962432e710a0c160727f5df
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Jan 31 16:41:09 2013 -0700

    Rewritten compose attachment code
    
    Attachment now represented by the IMP_Compose_Attachment object.
    
    Always use VFS to store attachments - if VFS not active, create a dummy
    VFS object using the local temporary filesystem settings
    
    Previously, we were using 2 separate methods to attach a message.
    Consolidate attachment code in single method (_addAttachment()) so we
    can do sanity checking/data analysis (e.g. MIME detection) in a single
    location.

 imp/lib/Ajax/Application/Handler/Dynamic.php |    5 +-
 imp/lib/Ajax/Queue.php                       |   25 +-
 imp/lib/Application.php                      |    1 +
 imp/lib/Basic/Compose.php                    |   12 +-
 imp/lib/Compose.php                          |  465 +++++++++-----------------
 imp/lib/Compose/Attachment.php               |  176 ++++++++++
 imp/lib/Compose/View.php                     |    2 +-
 imp/lib/Factory/Compose.php                  |    1 -
 imp/lib/Factory/ComposeVfs.php               |   35 ++
 imp/lib/Minimal/Compose.php                  |    4 +-
 imp/package.xml                              |    8 +-
 11 files changed, 398 insertions(+), 336 deletions(-)
 create mode 100644 imp/lib/Compose/Attachment.php
 create mode 100644 imp/lib/Factory/ComposeVfs.php

http://git.horde.org/horde-git/-/commit/e73a1bd0981228ffb962432e710a0c160727f5df

-----------------------------------------------------------------------

commit be454c4da0f791afe9a8c4ddff413529538f7162
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 3 12:38:16 2013 -0700

    VFS_ATTACH_PATH has moved

 imp/lib/LoginTasks/SystemTask/GarbageCollection.php |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/be454c4da0f791afe9a8c4ddff413529538f7162

-----------------------------------------------------------------------

commit 8967a6d8019adf5b42a7035c7354391885da0da4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 3 12:42:47 2013 -0700

    Another place we use VFS_ATTACH_PATH

 imp/lib/Compose.php |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/8967a6d8019adf5b42a7035c7354391885da0da4

-----------------------------------------------------------------------

commit 4bdef5425ce104d6944e2cf1ea690e9ef4ff3c1e
Merge: 8967a6d a58fe96
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 3 12:47:06 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 ansel/docs/CREDITS                                                |    1 +
 ansel/js/views/gallery-common.js                                  |  112 +
 ansel/js/widgets/tagactions.js                                    |    3 +
 ansel/lib/GalleryMode/Base.php                                    |    2 +
 ansel/lib/Tile/Image.php                                          |   13 +-
 ansel/lib/View/Gallery.php                                        |   54 +-
 ansel/lib/View/GalleryProperties.php                              |    2 +-
 ansel/lib/View/GalleryRenderer/Base.php                           |  173 +-
 ansel/lib/View/GalleryRenderer/Gallery.php                        |  117 +-
 ansel/lib/View/GalleryRenderer/GalleryLightbox.php                |  145 +-
 ansel/locale/sk/LC_MESSAGES/ansel.po                              |  663 +-
 ansel/package.xml                                                 |   22 +-
 ansel/templates/tile/image.html.php                               |    2 +-
 ansel/templates/view/api/gallery.html.php                         |   43 +
 ansel/templates/view/gallery.html.php                             |   92 +
 ansel/templates/view/gallery.inc                                  |  171 -
 ansel/templates/view/gallerylightbox.inc                          |  204 -
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php  |   23 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |   48 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php   |   51 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |  101 +-
 framework/ActiveSync/package.xml                                  |   28 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   15 +-
 framework/Core/locale/sk/LC_MESSAGES/Horde_Core.mo                |  Bin 16427 -> 19588 bytes
 framework/Core/locale/sk/LC_MESSAGES/Horde_Core.po                |  722 +-
 framework/Core/package.xml                                        |   25 +-
 framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php       |   31 +-
 .../Date_Parser/lib/Horde/Date/Parser/Locale/Base/Timezone.php    |    2 +-
 framework/Date_Parser/lib/Horde/Date/Parser/Token.php             |    6 +-
 framework/Date_Parser/test/Horde/Date/Parser/ParserTest.php       |   40 +
 framework/Date_Parser/test/Horde/Date/Parser/TokenTest.php        |   26 +
 framework/Db/lib/Horde/Db/Adapter/Mysql.php                       |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Filter.php                 |    3 -
 .../Kolab_FreeBusy/locale/sk/LC_MESSAGES/Horde_Kolab_FreeBusy.mo  |  Bin 661 -> 1820 bytes
 .../Kolab_FreeBusy/locale/sk/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |  101 +-
 framework/Mime/locale/sk/LC_MESSAGES/Horde_Mime.mo                |  Bin 1395 -> 1307 bytes
 framework/Mime/locale/sk/LC_MESSAGES/Horde_Mime.po                |   38 +-
 framework/bin/pear_batch_install                                  |    3 +
 gollem/locale/sk/LC_MESSAGES/gollem.mo                            |  Bin 72844 -> 72384 bytes
 gollem/locale/sk/LC_MESSAGES/gollem.po                            |  188 +-
 horde/lib/Api.php                                                 |  133 +-
 imp/docs/CHANGES                                                  |    2 +
 imp/js/dimpbase.js                                                |    1 +
 imp/js/dimpcore.js                                                |    4 +-
 imp/js/search.js                                                  |    3 +-
 imp/lib/Compose.php                                               |    4 +-
 imp/lib/LoginTasks/Task/PurgeSentmail.php                         |    2 +-
 imp/locale/de/LC_MESSAGES/imp.mo                                  |  Bin 181519 -> 181520 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                  |   10 +-
 imp/locale/sk/LC_MESSAGES/imp.mo                                  |  Bin 178326 -> 178051 bytes
 imp/locale/sk/LC_MESSAGES/imp.po                                  | 2000 ++---
 imp/package.xml                                                   |    2 +
 ingo/docs/CHANGES                                                 |    3 +
 ingo/lib/Script/Maildrop/Recipe.php                               |    3 +-
 ingo/lib/Script/Procmail/Recipe.php                               |   27 +-
 ingo/package.xml                                                  |    6 +-
 ingo/rule.php                                                     |    6 +-
 mnemo/docs/CHANGES                                                |    1 +
 mnemo/locale/sk/LC_MESSAGES/mnemo.mo                              |  Bin 72837 -> 74156 bytes
 mnemo/locale/sk/LC_MESSAGES/mnemo.po                              |   81 +-
 mnemo/package.xml                                                 |    2 +
 61 files changed, 2873 insertions(+), 2689 deletions(-)

http://git.horde.org/horde-git/-/commit/4bdef5425ce104d6944e2cf1ea690e9ef4ff3c1e

-----------------------------------------------------------------------

commit 9df2b9d4e897efa38e41d292df8c1247ae63f061
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 3 13:09:42 2013 -0700

    Cleanup addRelatedAttachment() method to prepare for additional of related parts from browser data

 imp/lib/Compose.php |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/9df2b9d4e897efa38e41d292df8c1247ae63f061

-----------------------------------------------------------------------

commit b25ac38ad7653ea009bc74b383f4112e728e6d79
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 3 13:54:08 2013 -0700

    Fix variable

 imp/lib/Compose/Attachment.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/b25ac38ad7653ea009bc74b383f4112e728e6d79

-----------------------------------------------------------------------

commit a6811ce579db2792984734abfafbaac4b815ae66
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 3 13:54:33 2013 -0700

    Add IMP_Compose_Attachment#viewUrl()

 imp/lib/Compose.php            |    9 +++------
 imp/lib/Compose/Attachment.php |   16 ++++++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/a6811ce579db2792984734abfafbaac4b815ae66

-----------------------------------------------------------------------

commit e10ac99112e51bd065da85f719ece33d28c4644f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 3 13:54:44 2013 -0700

    Fix undefined variable

 imp/lib/Compose.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/e10ac99112e51bd065da85f719ece33d28c4644f

-----------------------------------------------------------------------

commit f4eb53e6f9de3856cfa585c03bf0fe03b429f06c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 3 14:16:38 2013 -0700

    Fix function call

 imp/lib/Dynamic/Compose/Common.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/f4eb53e6f9de3856cfa585c03bf0fe03b429f06c

-----------------------------------------------------------------------

commit 675fa6819e16196d480ea8b6fa5de47d187ba2f3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 3 14:17:57 2013 -0700

    [mms] Allow drag & drop/pasting of images into the HTML editor.

 imp/docs/CHANGES                             |    1 +
 imp/js/ckeditor/pasteattachment.js           |   12 +++----
 imp/lib/Ajax/Application/Handler/Dynamic.php |   22 ++++++++++++
 imp/lib/Compose.php                          |   46 ++++++++++++++------------
 imp/package.xml                              |    2 +
 5 files changed, 55 insertions(+), 28 deletions(-)

http://git.horde.org/horde-git/-/commit/675fa6819e16196d480ea8b6fa5de47d187ba2f3

-----------------------------------------------------------------------

commit daf9d616c0df87ff69621daada030dabf1460dcd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 3 14:53:59 2013 -0700

    Fix deleting attachments from dynamic view

 imp/lib/Ajax/Application/Handler/Dynamic.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/daf9d616c0df87ff69621daada030dabf1460dcd

-----------------------------------------------------------------------

commit e4b466888d2bc5a8ea7455150c43d92591c395c1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 14:25:16 2013 -0700

    Fix PHP issue causing only the first attachment's data to be inserted into the message
    
    Nothing like spending hours trying to track down the issue, only to find
    out it may be an issue in PHP's core.  See:
    
    https://bugs.php.net/bug.php?id=64146

 imp/lib/Compose/Attachment.php |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/e4b466888d2bc5a8ea7455150c43d92591c395c1

-----------------------------------------------------------------------

commit 34c51bfade557c804b362de3457171cedbcd7451
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 14:29:55 2013 -0700

    Don't show attachment info for related data

 imp/lib/Ajax/Application/Handler/Dynamic.php |    6 +-
 imp/lib/Compose.php                          |    3 -
 imp/lib/Contents.php                         |   67 ++++++++++----------------
 3 files changed, 29 insertions(+), 47 deletions(-)

http://git.horde.org/horde-git/-/commit/34c51bfade557c804b362de3457171cedbcd7451

-----------------------------------------------------------------------

commit be25f2329570e4b2cb15b4867675a078e977ff0a
Merge: 34c51bf ab9d5ff
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 15:33:50 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 ansel/browse.php                                                  |    3 +-
 ansel/gallery.php                                                 |  100 +-
 ansel/gallery/delete.php                                          |   84 -
 ansel/image.php                                                   |  875 +----
 ansel/js/views/common.js                                          |  112 +
 ansel/js/views/gallery-common.js                                  |  112 -
 ansel/lib/ActionHandler.php                                       | 1046 +++++
 ansel/lib/Ajax/Application/Handler.php                            |    5 +-
 ansel/lib/Search.php                                              |  101 -
 ansel/lib/Search/Tag.php                                          |  305 --
 ansel/lib/Search/exif.php                                         |   42 -
 ansel/lib/Storage.php                                             |   37 +-
 ansel/lib/TagBrowser.php                                          |  128 +
 ansel/lib/View/GalleryProperties.php                              |   13 +-
 ansel/lib/View/GalleryRenderer/Base.php                           |    4 +-
 ansel/lib/View/GalleryRenderer/Gallery.php                        |    1 +
 ansel/lib/View/Results.php                                        |  239 +-
 ansel/lib/Widget/Actions.php                                      |    2 +-
 ansel/lib/Widget/Tags.php                                         |   29 +-
 ansel/package.xml                                                 |   26 +-
 ansel/templates/gallery/delete_confirmation.inc                   |    4 +-
 ansel/templates/gallery/properties.html.php                       |   29 +-
 ansel/templates/view/gallery.html.php                             |   13 +-
 ansel/templates/view/results.html.php                             |   95 +
 ansel/templates/view/results.inc                                  |  140 -
 framework/Editor/js/ckeditor/LICENSE.html                         |    4 +-
 framework/Editor/js/ckeditor/ckeditor.js                          |    2 +-
 framework/Editor/js/ckeditor/ckeditor_basic.js                    |    2 +-
 framework/Editor/js/ckeditor/contents.css                         |    2 +-
 framework/Editor/js/ckeditor/lang/af.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/ar.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/bg.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/bn.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/bs.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/ca.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/cs.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/cy.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/da.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/de.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/el.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/en-au.js                        |    2 +-
 framework/Editor/js/ckeditor/lang/en-ca.js                        |    2 +-
 framework/Editor/js/ckeditor/lang/en-gb.js                        |    2 +-
 framework/Editor/js/ckeditor/lang/en.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/eo.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/es.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/et.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/eu.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/fa.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/fi.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/fo.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/fr-ca.js                        |    2 +-
 framework/Editor/js/ckeditor/lang/fr.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/gl.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/gu.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/he.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/hi.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/hr.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/hu.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/id.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/is.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/it.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/ja.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/ka.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/km.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/ko.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/ku.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/lt.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/lv.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/mk.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/mn.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/ms.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/nb.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/nl.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/no.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/pl.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/pt-br.js                        |    2 +-
 framework/Editor/js/ckeditor/lang/pt.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/ro.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/ru.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/sk.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/sl.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/sr-latn.js                      |    2 +-
 framework/Editor/js/ckeditor/lang/sr.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/sv.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/th.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/tr.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/ug.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/uk.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/vi.js                           |    2 +-
 framework/Editor/js/ckeditor/lang/zh-cn.js                        |    2 +-
 framework/Editor/js/ckeditor/lang/zh.js                           |    2 +-
 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/lv.js          |    1 +
 framework/Editor/js/ckeditor/plugins/devtools/lang/lv.js          |    1 +
 framework/Editor/js/ckeditor/plugins/placeholder/lang/lv.js       |    1 +
 framework/Editor/js/ckeditor/plugins/scayt/dialogs/toolbar.css    |    2 +-
 framework/Editor/js/ckeditor/plugins/specialchar/lang/lv.js       |    1 +
 framework/Editor/js/ckeditor/plugins/specialchar/lang/sk.js       |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/lang/lv.js           |    1 +
 framework/Editor/js/ckeditor/plugins/uicolor/yui/assets/yui.css   |    2 +-
 framework/Editor/js/ckeditor/plugins/wsc/dialogs/ciframe.html     |    2 +-
 framework/Editor/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html |    2 +-
 framework/Editor/js/ckeditor/plugins/wsc/dialogs/wsc.css          |    2 +-
 framework/Editor/js/ckeditor/skins/kama/dialog.css                |    2 +-
 framework/Editor/js/ckeditor/skins/kama/editor.css                |    4 +-
 framework/Editor/js/ckeditor/skins/kama/templates.css             |    2 +-
 framework/Editor/js/ckeditor/skins/office2003/dialog.css          |    2 +-
 framework/Editor/js/ckeditor/skins/office2003/editor.css          |   16 +-
 framework/Editor/js/ckeditor/skins/office2003/templates.css       |    2 +-
 framework/Editor/js/ckeditor/skins/v2/dialog.css                  |    2 +-
 framework/Editor/js/ckeditor/skins/v2/editor.css                  |    6 +-
 framework/Editor/js/ckeditor/skins/v2/templates.css               |    2 +-
 framework/Editor/package.xml                                      |   22 +-
 horde/js/plupload/uploader.js                                     |    2 +-
 imp/docs/CHANGES                                                  |    2 +
 imp/lib/Dynamic/Compose/Common.php                                |    7 +-
 imp/package.xml                                                   |    1 +
 imp/templates/dynamic/compose.html.php                            |    6 +
 wicked/docs/CHANGES                                               |    1 +
 wicked/lib/Text_Wiki/Render/Rst/Blockquote.php                    |   59 +
 wicked/lib/Text_Wiki/Render/Rst/Emphasis.php                      |   46 +
 wicked/package.xml                                                |   12 +-
 122 files changed, 1817 insertions(+), 2076 deletions(-)

http://git.horde.org/horde-git/-/commit/be25f2329570e4b2cb15b4867675a078e977ff0a

-----------------------------------------------------------------------

commit 8417da6e634442becb83476f8aea337a1c2704c1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 15:36:02 2013 -0700

    No need to determine size if we are deleting all attachments

 imp/lib/Compose.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8417da6e634442becb83476f8aea337a1c2704c1

-----------------------------------------------------------------------

commit 5ee5144972a18aab10e948728d795f93f63b5e88
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 18:47:17 2013 -0700

    [mms] Add image upload feature to the HTML editor image plugin.

 imp/docs/CHANGES                             |    1 +
 imp/js/ckeditor/imageupload.js               |   45 ++++++++++++++++++++++
 imp/lib/Ajax/Application/Handler/Dynamic.php |   52 ++++++++++++++++++++++++++
 imp/lib/Compose/Attachment.php               |    2 +-
 imp/lib/Script/Package/ComposeBase.php       |    6 +++
 imp/package.xml                              |    8 +++-
 6 files changed, 111 insertions(+), 3 deletions(-)
 create mode 100644 imp/js/ckeditor/imageupload.js

http://git.horde.org/horde-git/-/commit/5ee5144972a18aab10e948728d795f93f63b5e88

-----------------------------------------------------------------------

commit 974541b8fb468d9694aa0be861141bad689892d0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 21:00:12 2013 -0700

    Add button shortcut on initial ckeditor plugin page to open the upload tab

 imp/js/ckeditor/imageupload.js |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/974541b8fb468d9694aa0be861141bad689892d0

-----------------------------------------------------------------------

commit 70b2a1c7f21dfa54e9f3ba4048e1812cd62eb18b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 21:10:52 2013 -0700

    Actually use the correct attachment ID

 imp/lib/Ajax/Application/Handler/Dynamic.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/70b2a1c7f21dfa54e9f3ba4048e1812cd62eb18b

-----------------------------------------------------------------------

commit 5f96e6d45e598ad22cc4b2c8c5ce4ea4838a4b16
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 22:18:06 2013 -0700

    Fix minimal page links

 imp/lib/Minimal/Mailbox.php     |    2 +-
 imp/lib/Minimal/Message.php     |    2 +-
 imp/lib/Minimal/Messagepart.php |    2 +-
 imp/lib/Minimal/Search.php      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/5f96e6d45e598ad22cc4b2c8c5ce4ea4838a4b16

-----------------------------------------------------------------------

commit 857cd83405bbf6bf03d40d6ac788638495f2f2a3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 22:18:41 2013 -0700

    [mms] Minimal menu entries are now accessible via numbered accesskeys (Request #5847).

 imp/docs/CHANGES                    |    2 ++
 imp/package.xml                     |    2 ++
 imp/templates/minimal/menu.html.php |    5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/857cd83405bbf6bf03d40d6ac788638495f2f2a3

-----------------------------------------------------------------------

commit d42933d47604f421ca8098f33b98a842413b3ae6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 23:29:48 2013 -0700

    Fix template location

 imp/rss.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/d42933d47604f421ca8098f33b98a842413b3ae6

-----------------------------------------------------------------------

commit d74533cdaf24caed74bd6802daac0e015705e8ba
Merge: d42933d fb76adf
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 23:36:13 2013 -0700

    Merge branch 'master' into imp_6_1

 ansel/lib/View/Base.php                                 |    2 +-
 ansel/lib/View/Gallery.php                              |    2 +-
 ansel/lib/View/GalleryProperties.php                    |    2 +-
 ansel/lib/View/Image.php                                |   11 ++----
 ansel/lib/View/List.php                                 |    2 +-
 ansel/lib/View/Results.php                              |    2 +-
 ansel/lib/View/Slideshow.php                            |    1 -
 ansel/lib/View/Upload.php                               |    2 +-
 ansel/view.php                                          |    8 ++--
 framework/Core/js/jquery.mobile/plugins/autocomplete.js |   15 +++++++--
 framework/Core/package.xml                              |    4 +-
 framework/Mime/lib/Horde/Mime/Part.php                  |    9 +-----
 framework/Mime/package.xml                              |    4 +-
 framework/Mime/test/Horde/Mime/PartTest.php             |   25 ++++++++++++---
 imp/rss.php                                             |   12 ++++---
 15 files changed, 58 insertions(+), 43 deletions(-)

http://git.horde.org/horde-git/-/commit/d74533cdaf24caed74bd6802daac0e015705e8ba

-----------------------------------------------------------------------

commit 9082c54e675dbeb81ab5b9b8f0672d8631ee83b0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 23:53:00 2013 -0700

    More fixes to compose attachment access

 imp/lib/Basic/Compose.php   |    4 ++--
 imp/lib/Minimal/Compose.php |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/9082c54e675dbeb81ab5b9b8f0672d8631ee83b0

-----------------------------------------------------------------------

commit 1f1bc7c755411d05e929099d3b17ccc5d91d8705
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 4 23:53:57 2013 -0700

    Consistently use IMP_Compose_Attachment#viewUrl() to generate attachment data view URL

 imp/js/compose-dimp.js    |   16 +++++-----------
 imp/lib/Ajax/Queue.php    |    3 ++-
 imp/lib/Basic/Compose.php |    7 +------
 3 files changed, 8 insertions(+), 18 deletions(-)

http://git.horde.org/horde-git/-/commit/1f1bc7c755411d05e929099d3b17ccc5d91d8705

-----------------------------------------------------------------------

commit c7c0882273f4cfecbe17e12e392ad7ec74a7809e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 00:34:40 2013 -0700

    Store compose cache ID in attachment objects

 imp/lib/Ajax/Application/Handler/Dynamic.php |    4 ++--
 imp/lib/Basic/Compose.php                    |    2 +-
 imp/lib/Compose.php                          |   22 ++++++++++------------
 imp/lib/Compose/Attachment.php               |   23 ++++++++++++++++-------
 4 files changed, 29 insertions(+), 22 deletions(-)

http://git.horde.org/horde-git/-/commit/c7c0882273f4cfecbe17e12e392ad7ec74a7809e

-----------------------------------------------------------------------

commit 4ed1f129c6d5992566cb43e3a81dc9d3dcaa07ef
Merge: c7c0882 17061ce
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 13:02:41 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 framework/Argv/lib/Horde/Argv/Parser.php                 |   17 ----
 framework/Cli_Modular/lib/Horde/Cli/Modular.php          |   28 +++----
 framework/Core/js/map/horde.js                           |   22 +++---
 framework/Core/lib/Horde/Core/Factory/Notification.php   |   19 +++--
 framework/Core/lib/Horde/Registry.php                    |    1 +
 framework/Core/package.xml                               |    2 +
 framework/Text_Filter/lib/Horde/Text/Filter/Xss.php      |   36 --------
 framework/Text_Filter/package.xml                        |    4 +-
 framework/Text_Filter/test/Horde/Text/Filter/XssTest.php |  Bin 23500 -> 23372 bytes
 framework/Util/lib/Horde/Domhtml.php                     |   58 +++++++++++-
 framework/Util/package.xml                               |   16 ++--
 framework/Util/test/Horde/Util/DomhtmlTest.php           |   65 ++++++++++++++
 imp/docs/CHANGES                                         |    1 +
 imp/lib/Mime/Viewer/Html.php                             |   17 +++-
 imp/package.xml                                          |    3 +-
 15 files changed, 186 insertions(+), 103 deletions(-)

http://git.horde.org/horde-git/-/commit/4ed1f129c6d5992566cb43e3a81dc9d3dcaa07ef

-----------------------------------------------------------------------

commit c443620adcea40bc5be422be11e66634aae149e0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 14:44:14 2013 -0700

    'page' is used for name of page view; use mpage to indicate mailbox page number

 imp/lib/Basic/Mailbox.php                       |   16 ++++++++--------
 imp/templates/basic/mailbox/form_start.html.php |    2 +-
 imp/templates/basic/mailbox/navbar.html.php     |    4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/c443620adcea40bc5be422be11e66634aae149e0

-----------------------------------------------------------------------

commit 92851e5c494c8f7c71be07566ad473ac4d795e22
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 14:54:10 2013 -0700

    [mms] Add discard draft option to compose page allowing the user to cancel composition and permanently delete the original draft (Request #12017).

 imp/docs/CHANGES                             |    2 +
 imp/js/compose-dimp.js                       |   10 +++++++-
 imp/js/compose.js                            |   10 +++++---
 imp/js/smartmobile.js                        |    8 ++++++-
 imp/lib/Ajax/Application/Handler/Common.php  |    3 +-
 imp/lib/Basic/Compose.php                    |   27 ++++++++++++-----------
 imp/lib/Compose.php                          |   20 +++++++++++------
 imp/lib/Dynamic/Compose.php                  |    1 +
 imp/lib/Dynamic/Compose/Common.php           |    2 +
 imp/lib/Minimal/Compose.php                  |    6 +++++
 imp/package.xml                              |    2 +
 imp/templates/basic/compose/compose.html.php |    3 ++
 imp/templates/dynamic/compose.html.php       |   29 +++++++++++++++----------
 imp/templates/minimal/compose.html.php       |    3 ++
 imp/templates/smartmobile/compose.html.php   |    1 +
 15 files changed, 87 insertions(+), 40 deletions(-)

http://git.horde.org/horde-git/-/commit/92851e5c494c8f7c71be07566ad473ac4d795e22

-----------------------------------------------------------------------

commit c0ce7a6712259fbc6413231ec7ac595c9c855085
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 15:35:11 2013 -0700

    Fix disappear proccessing when not using threaded sort

 imp/js/viewport.js           |    7 ++++---
 imp/lib/Ajax/Application.php |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/c0ce7a6712259fbc6413231ec7ac595c9c855085

-----------------------------------------------------------------------

commit c8f09fe1d51945e375967eeffe226dec3d90a167
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 18:20:53 2013 -0700

    Fix viewing all parts

 imp/js/dimpbase.js     |    4 ++--
 imp/js/message-dimp.js |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/c8f09fe1d51945e375967eeffe226dec3d90a167

-----------------------------------------------------------------------

commit 061d2711ddece41522dc3eacf06ec29957894e07
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 18:21:28 2013 -0700

    Tweak changelog entry

 imp/docs/CHANGES |    4 ++--
 imp/package.xml  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/061d2711ddece41522dc3eacf06ec29957894e07

-----------------------------------------------------------------------

commit d8302a4216bcd2c79f994421ed8d477b0e59e022
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 5 23:25:12 2013 -0700

    [mms] Rewritten/improved linked attachment code.
    
    Reduce overall storage space in VFS backend - single folder contains
    all attachments for a user rather than a new folder for every
    message.
    
    Additionally, there is now a single metadata file for a user rather than
    (potentially) one metadata file per attachment. This should also speed
    up the pruning login task (vastly reduces the number of VFS calls needed
    to determine whether a file is expired).
    
    This metadata file now contains the timestamp and the MIME type (the
    MIME type no longer needs to be determined dynamically every time the
    file is downloaded).
    
    Stream the file to the browser to reduce memory usage.
    
    Attachments are now accessed by a UUID rather than a potentially
    complicated filename.
    
    Backend logic now lives in library rather than display script.
    
    More details are now displayed to the receiving user regarding the
    attachment contents.

 imp/attachment.php                                   |  142 ++-----
 imp/docs/CHANGES                                     |    1 +
 imp/docs/UPGRADING                                   |    7 +
 imp/lib/Compose.php                                  |   52 +--
 imp/lib/Compose/LinkedAttachment.php                 |  390 ++++++++++++++++++
 imp/lib/LoginTasks/Task/DeleteAttachmentsMonthly.php |   28 +--
 imp/package.xml                                      |   10 +-
 7 files changed, 457 insertions(+), 173 deletions(-)
 create mode 100644 imp/lib/Compose/LinkedAttachment.php

http://git.horde.org/horde-git/-/commit/d8302a4216bcd2c79f994421ed8d477b0e59e022

-----------------------------------------------------------------------

commit 6beee13816c7b3243110857a84aea50fe2bfd925
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 00:25:39 2013 -0700

    IMP_Mailbox_Ui::getSize() -> IMP::sizeFormat()

 imp/lib/Ajax/Application/ListMessages.php |    2 +-
 imp/lib/Basic/Mailbox.php                 |    2 +-
 imp/lib/Compose.php                       |    3 +--
 imp/lib/IMP.php                           |   14 ++++++++++++++
 imp/lib/Mailbox/Ui.php                    |   14 --------------
 imp/lib/Minimal/Compose.php               |    4 +---
 6 files changed, 18 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/6beee13816c7b3243110857a84aea50fe2bfd925

-----------------------------------------------------------------------

commit cc5c35fdc68296d685b7e2efdf6048df83e4a528
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 00:39:35 2013 -0700

    update package.xml requirements

 imp/package.xml |   42 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 35 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/cc5c35fdc68296d685b7e2efdf6048df83e4a528

-----------------------------------------------------------------------

commit 9e43806de0676cc6058e1d70d82b814882e4b8d8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 00:51:45 2013 -0700

    Use injector to determine if mail logging is available

 imp/lib/Ajax/Queue.php      |   26 ++++++++++++++------------
 imp/lib/Application.php     |    1 +
 imp/lib/Basic/Message.php   |    4 ++--
 imp/lib/Compose.php         |   10 +++++-----
 imp/lib/Factory/Maillog.php |   38 ++++++++++++++++++++++++++++++++++++++
 imp/lib/Message.php         |    9 +++++----
 imp/lib/Message/Ui.php      |    9 ++++++---
 imp/package.xml             |    6 ++++--
 8 files changed, 75 insertions(+), 28 deletions(-)
 create mode 100644 imp/lib/Factory/Maillog.php

http://git.horde.org/horde-git/-/commit/9e43806de0676cc6058e1d70d82b814882e4b8d8

-----------------------------------------------------------------------

commit 4536af0de44ed70b3fd66b62eb36f09cd82b3771
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 00:54:30 2013 -0700

    whoops

 imp/lib/Factory/Maillog.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/4536af0de44ed70b3fd66b62eb36f09cd82b3771

-----------------------------------------------------------------------

commit 5fd8e214bbf3cc89599c90160a916ab5129dde06
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 01:34:03 2013 -0700

    Excessively wordy

 imp/templates/prefs/searches.html.php |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/5fd8e214bbf3cc89599c90160a916ab5129dde06

-----------------------------------------------------------------------

commit 0d43e011f9bbf5797191fa6681c2067eb11c5582
Merge: 5fd8e21 3a3d09c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 12:49:30 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/js/smartmobile.js
    	imp/lib/Ajax/Application/Handler/Common.php

 ansel/lib/Api.php                                                 |    7 +-
 framework/Core/lib/Horde/Core/Tagger.php                          |    5 +-
 .../Prefs/test/Horde/Prefs/Unit/Storage/KolabImapLogTest.php      |    4 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/KolabImapTest.php   |    2 +
 framework/Push/test/Horde/Push/Unit/Push/CliTest.php              |    5 -
 framework/Push/test/Horde/Push/Unit/Push/Factory/PushTest.php     |    1 +
 framework/bin/test_framework                                      |    9 +-
 imp/js/compose-dimp.js                                            |    4 +-
 imp/js/dimpbase.js                                                |   15 +-
 imp/js/imp.js                                                     |    7 +-
 imp/js/message-dimp.js                                            |   17 +-
 imp/js/smartmobile.js                                             |   18 +-
 imp/lib/Ajax/Application/Handler/Common.php                       |    8 +-
 kronolith/lib/Ajax/Application/Handler.php                        |   62 --
 kronolith/lib/Ajax/Imple/TagActions.php                           |  139 -----
 kronolith/package.xml                                             |    8 +-
 16 files changed, 60 insertions(+), 251 deletions(-)

http://git.horde.org/horde-git/-/commit/0d43e011f9bbf5797191fa6681c2067eb11c5582

-----------------------------------------------------------------------

commit 309b2df434ac575d66c5f6c2fc228c6bd7f856ab
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 13:50:08 2013 -0700

    Upgrade old linked attachments

 imp/attachment.php                   |    7 ++++
 imp/docs/UPGRADING                   |    7 ----
 imp/lib/Compose/LinkedAttachment.php |   51 +++++++++++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/309b2df434ac575d66c5f6c2fc228c6bd7f856ab

-----------------------------------------------------------------------

commit 8397821e9fa14a491d675b25882e6bd75725fc33
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 14:44:21 2013 -0700

    Number(undefined) resolved to NaN instead of false

 imp/js/compose-dimp.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8397821e9fa14a491d675b25882e6bd75725fc33

-----------------------------------------------------------------------

commit 651f77cbc738557d4c09d66d8a2e9b12155cf164
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 14:45:16 2013 -0700

    Fix doubleclick template/resume actions

 imp/js/dimpbase.js |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/651f77cbc738557d4c09d66d8a2e9b12155cf164

-----------------------------------------------------------------------

commit 6f29e874df412f77778334ad3967cbb3f664c814
Merge: 651f77c dea61b0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 14:53:22 2013 -0700

    Merge branch 'master' into imp_6_1

 content/lib/Tagger.php            |    4 ++--
 content/lib/Types/Manager.php     |    4 ++--
 content/test/Content/Base.php     |   30 +++++++++++++++++++++---------
 content/test/Content/Sql/Base.php |    6 ++++++
 imp/js/compose-dimp.js            |    6 ++++--
 5 files changed, 35 insertions(+), 15 deletions(-)

http://git.horde.org/horde-git/-/commit/6f29e874df412f77778334ad3967cbb3f664c814

-----------------------------------------------------------------------

commit 7d62b2159549db197dc747ac9152abbcaeb11be3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 6 23:52:55 2013 -0700

    Foo

 framework/Mime/test/Horde/Mime/PartTest.php |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/7d62b2159549db197dc747ac9152abbcaeb11be3

-----------------------------------------------------------------------

commit 967fd402014c3f7e1fbae46504886ae3bba308a6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 7 02:34:10 2013 -0700

    sanity checking not needed here

 imp/attachment.php |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/967fd402014c3f7e1fbae46504886ae3bba308a6

-----------------------------------------------------------------------

commit 5f95730795bd4ee82fa1faff7bae2fb890136675
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 7 13:09:55 2013 -0700

    Revert "Foo"
    
    This reverts commit 7d62b2159549db197dc747ac9152abbcaeb11be3.
    
    Not needed - this is a PHP issue

 framework/Mime/test/Horde/Mime/PartTest.php |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/5f95730795bd4ee82fa1faff7bae2fb890136675

-----------------------------------------------------------------------

commit 19769da2490d35d5b68b70b849c5eb9a33f6a0a7
Merge: 5f95730 13e3e9c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 7 13:10:09 2013 -0700

    Merge branch 'master' into imp_6_1

 ansel/js/imagefaces.js                                |    4 +-
 ansel/js/views/image.js                               |   57 +
 ansel/lib/Image.php                                   |   30 +-
 ansel/lib/View/Image.php                              |  260 +-
 ansel/templates/view/gallery.html.php                 |    2 +-
 ansel/templates/view/image.html.php                   |   98 +
 ansel/templates/view/image.inc                        |   96 -
 ansel/themes/default/screen.css                       |   18 +-
 content/docs/CHANGES                                  |    2 +
 content/package.xml                                   |    4 +-
 framework/Core/js/jquery.mobile/jquery.js             | 8342 +++++++++--------
 framework/Core/js/jquery.mobile/jquery.min.js         |    6 +-
 framework/Core/js/jquery.mobile/jquery.mobile.js      | 5531 +++++++-----
 framework/Core/js/jquery.mobile/jquery.mobile.min.css |    4 +-
 framework/Core/js/jquery.mobile/jquery.mobile.min.js  |  186 +-
 framework/Core/js/map/OpenLayers-debug.js             |    8 -
 framework/Core/js/map/OpenLayers.js                   | 1943 +++--
 framework/Core/lib/Horde/Core/Auth/Application.php    |    2 +-
 framework/Core/package.xml                            |    4 +
 19 files changed, 9197 insertions(+), 7400 deletions(-)

http://git.horde.org/horde-git/-/commit/19769da2490d35d5b68b70b849c5eb9a33f6a0a7

-----------------------------------------------------------------------

commit 89c0be5e32491235a3944512a6b0e6f8cb0083b5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 7 15:45:43 2013 -0700

    Cleaner linking of S/MIME certificate details

 imp/lib/Mime/Viewer/Smime.php |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/89c0be5e32491235a3944512a6b0e6f8cb0083b5

-----------------------------------------------------------------------

commit 91045b0cebb70e2166bc0d4328ac28c75e737d4f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 7 16:02:10 2013 -0700

    Fix message actions from popup windows

 imp/js/dimpbase.js |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/91045b0cebb70e2166bc0d4328ac28c75e737d4f

-----------------------------------------------------------------------

commit 74d64e85035b452387fc7bb51ee4361271a56346
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 7 17:17:37 2013 -0700

    Simplify storage/retrieval of IMP_Imap object
    
    Originally, the idea was that the factory could be used to create
    separate objects for each account accessed.  But it is going to be
    easier and more transparent to simply do this wholly within the IMP_Imap
    object itself.

 imp/bin/imp-query-imap-cache                             |    2 +-
 imp/config/hooks.php.dist                                |    2 +-
 imp/config/prefs.php                                     |   40 ++++----
 imp/lib/Ajax/Application.php                             |    2 +-
 imp/lib/Ajax/Application/ListMessages.php                |    4 +-
 imp/lib/Ajax/Application/ShowMessage.php                 |    4 +-
 imp/lib/Ajax/Queue.php                                   |    4 +-
 imp/lib/Api.php                                          |    6 +-
 imp/lib/Application.php                                  |    7 +-
 imp/lib/Auth.php                                         |   13 +--
 imp/lib/Basic/Compose.php                                |    2 +-
 imp/lib/Basic/Folders.php                                |    2 +-
 imp/lib/Basic/Mailbox.php                                |    2 +-
 imp/lib/Basic/Message.php                                |    2 +-
 imp/lib/Basic/Search.php                                 |    2 +-
 imp/lib/Basic/Searchbasic.php                            |    2 +-
 imp/lib/Basic/Thread.php                                 |    2 +-
 imp/lib/Block/Newmail.php                                |    2 +-
 imp/lib/Block/Summary.php                                |    2 +-
 imp/lib/Compose.php                                      |   10 +-
 imp/lib/Contents.php                                     |    4 +-
 imp/lib/Dynamic/Base.php                                 |    2 +-
 imp/lib/Dynamic/Compose/Common.php                       |    2 +-
 imp/lib/Dynamic/Mailbox.php                              |    4 +-
 imp/lib/Factory/Imap.php                                 |   81 ++------------
 imp/lib/Factory/Mail.php                                 |    2 +-
 imp/lib/Factory/MailboxList.php                          |    2 +-
 imp/lib/Factory/Quota.php                                |    2 +-
 imp/lib/Flags.php                                        |    4 +-
 imp/lib/Imap/Acl.php                                     |   13 +-
 imp/lib/Imap/Tree.php                                    |   10 +-
 imp/lib/Indices.php                                      |   10 +-
 imp/lib/LoginTasks/SystemTask/UpgradeAuth.php            |    2 +-
 imp/lib/LoginTasks/Task/RenameSentmailMonthly.php        |    2 +-
 imp/lib/Mailbox.php                                      |   38 +++---
 imp/lib/Mailbox/List.php                                 |   12 +-
 imp/lib/Mbox/Generate.php                                |    2 +-
 imp/lib/Mbox/Import.php                                  |    2 +-
 imp/lib/Message.php                                      |   16 ++--
 imp/lib/Message/Ui.php                                   |    2 +-
 imp/lib/Minimal/Base.php                                 |    2 +-
 imp/lib/Minimal/Compose.php                              |    2 +-
 imp/lib/Minimal/Folders.php                              |    2 +-
 imp/lib/Minimal/Mailbox.php                              |    2 +-
 imp/lib/Minimal/Message.php                              |    2 +-
 imp/lib/Notification/Handler/Decorator/ImapAlerts.php    |    2 +-
 imp/lib/Notification/Handler/Decorator/NewmailNotify.php |    2 +-
 imp/lib/Prefs/Identity.php                               |    2 +-
 imp/lib/Prefs/Special/Sentmail.php                       |    2 +-
 imp/lib/Prefs/Special/Spam.php                           |    2 +-
 imp/lib/Prefs/Special/SpecialMboxes.php                  |    4 +-
 imp/lib/Prefs/Special/Trash.php                          |    2 +-
 imp/lib/Smartmobile.php                                  |    6 +-
 imp/rss.php                                              |    2 +-
 54 files changed, 149 insertions(+), 209 deletions(-)

http://git.horde.org/horde-git/-/commit/74d64e85035b452387fc7bb51ee4361271a56346

-----------------------------------------------------------------------

commit 8006f7227d08fccabf61c7f120705a7bee4caa3b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 7 23:22:28 2013 -0700

    use globals

 imp/lib/Ajax/Application/ShowMessage.php |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/8006f7227d08fccabf61c7f120705a7bee4caa3b

-----------------------------------------------------------------------

commit 80dbdfbf697a48bcb13a884d19ab1b3bf9b591f2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 7 23:38:16 2013 -0700

    Convert IMAP/POP3 object detection to factor in the current mailbox

 imp/config/prefs.php                                     |    2 +-
 imp/js/dimpbase.js                                       |   25 +++--
 imp/lib/Ajax/Application/ListMessages.php                |    3 +
 imp/lib/Ajax/Application/ShowMessage.php                 |    5 +-
 imp/lib/Api.php                                          |    2 +-
 imp/lib/Auth.php                                         |   71 ++++++-------
 imp/lib/Basic/Mailbox.php                                |    2 +-
 imp/lib/Basic/Message.php                                |    2 +-
 imp/lib/Block/Summary.php                                |    1 -
 imp/lib/Compose.php                                      |    4 +-
 imp/lib/Dynamic/Base.php                                 |    3 +-
 imp/lib/Dynamic/Mailbox.php                              |   17 +---
 imp/lib/Factory/MailboxList.php                          |    6 +-
 imp/lib/Flags.php                                        |    3 +-
 imp/lib/Imap.php                                         |   28 +++---
 imp/lib/Imap/Tree.php                                    |    2 +-
 imp/lib/Indices.php                                      |   11 --
 imp/lib/Mailbox.php                                      |   18 ++--
 imp/lib/Notification/Handler/Decorator/NewmailNotify.php |    4 +-
 19 files changed, 92 insertions(+), 117 deletions(-)

http://git.horde.org/horde-git/-/commit/80dbdfbf697a48bcb13a884d19ab1b3bf9b591f2

-----------------------------------------------------------------------

commit 87c2cee7335cdc3091c858004bc6cf4f4fbd78e8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 8 00:04:07 2013 -0700

    phpdoc

 imp/lib/Imap.php |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/87c2cee7335cdc3091c858004bc6cf4f4fbd78e8

-----------------------------------------------------------------------

commit a960ecef5cf494f151596dfba33e99849d78b688
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 8 00:18:34 2013 -0700

    Abstract retrieval of IMAP client object

 imp/config/hooks.php.dist                     |    4 +-
 imp/lib/Api.php                               |    6 ++--
 imp/lib/Imap.php                              |   43 ++++++++++++++-----------
 imp/lib/LoginTasks/SystemTask/UpgradeAuth.php |    4 +--
 4 files changed, 30 insertions(+), 27 deletions(-)

http://git.horde.org/horde-git/-/commit/a960ecef5cf494f151596dfba33e99849d78b688

-----------------------------------------------------------------------

commit 3c5406404754df3b8cd2e14e3df0aef9bc223766
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 8 15:34:57 2013 -0700

    Not used

 imp/lib/Smartmobile.php |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/3c5406404754df3b8cd2e14e3df0aef9bc223766

-----------------------------------------------------------------------

commit b10a1c6c675ff87e0975abf77ea7d14d69b1d901
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 8 15:42:59 2013 -0700

    Re-add total message count to smartmobile mailbox screen

 imp/js/smartmobile.js   |   16 ++++++++++++++++
 imp/lib/Smartmobile.php |    3 +++
 2 files changed, 19 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/b10a1c6c675ff87e0975abf77ea7d14d69b1d901

-----------------------------------------------------------------------

commit b65085c5ceb30f858934ce9f41ada30724e17b71
Merge: b10a1c6 762fd8e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 8 16:14:24 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/js/dimpbase.js

 framework/Core/js/jquery.mobile/jquery.js                         |  206 ++---
 framework/Core/js/jquery.mobile/jquery.min.js                     |    4 +-
 framework/Core/lib/Horde/Registry.php                             |    2 +-
 framework/Core/package.xml                                        |    4 +-
 framework/Db/test/Horde/Db/Adapter/MysqlTest.php                  |   18 +-
 framework/Db/test/Horde/Db/Adapter/MysqliTest.php                 |   18 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php              |   18 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlBase.php              |   16 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/SqliteBase.php             |   14 +-
 framework/History/test/Horde/History/InterfaceTest.php            |    2 +-
 framework/Imap_Client/package.xml                                 |   25 +-
 framework/Itip/lib/Horde/Itip/Resource.php                        |   12 +-
 framework/Itip/lib/Horde/Itip/Resource/Base.php                   |   21 +-
 framework/Itip/lib/Horde/Itip/Resource/Identity.php               |   43 +-
 framework/Itip/package.xml                                        |   11 +-
 framework/Itip/test/Horde/Itip/Stub/Identity.php                  |   13 +-
 framework/Mime/lib/Horde/Mime/Part.php                            |    2 +-
 framework/Prefs/lib/Horde/Prefs/Identity.php                      |   40 +-
 framework/Prefs/package.xml                                       |    2 +
 .../Prefs/test/Horde/Prefs/Unit/Storage/KolabImapLogTest.php      |    1 +
 framework/Rdo/test/Horde/Rdo/Sql/Base.php                         |    2 +-
 framework/Rdo/test/Horde/Rdo/TestBase.php                         |   14 -
 framework/Test/lib/Horde/Test/AllTests.php                        |    3 +-
 23 files changed, 236 insertions(+), 255 deletions(-)

http://git.horde.org/horde-git/-/commit/b65085c5ceb30f858934ce9f41ada30724e17b71

-----------------------------------------------------------------------

commit 19702a11f374221a3a709c33bb0ab8120afb373f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 8 18:19:14 2013 -0700

    Add access_flags and access_search properties to IMP_Mailbox

 imp/lib/Ajax/Application/ListMessages.php             |    6 +---
 imp/lib/Ajax/Queue.php                                |   20 +++++++---------
 imp/lib/Api.php                                       |    6 +----
 imp/lib/Auth.php                                      |    6 ++--
 imp/lib/Basic/Mailbox.php                             |    6 ++--
 imp/lib/Basic/Message.php                             |    2 +-
 imp/lib/Basic/Searchbasic.php                         |    2 +-
 imp/lib/Imap.php                                      |   16 +++++++++----
 imp/lib/Imap/Tree.php                                 |    7 +++--
 imp/lib/Mailbox.php                                   |   15 +++++++++---
 imp/lib/Minimal/Mailbox.php                           |    4 +-
 imp/lib/Notification/Handler/Decorator/ImapAlerts.php |    2 +-
 12 files changed, 49 insertions(+), 43 deletions(-)

http://git.horde.org/horde-git/-/commit/19702a11f374221a3a709c33bb0ab8120afb373f

-----------------------------------------------------------------------

commit 48c264a596e631a72f0faa211acc291f2f62b813
Merge: 19702a1 c1551f8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 9 13:27:43 2013 -0700

    Merge branch 'master' into imp_6_1

 .travis.yml                                                       |    2 -
 framework/ActiveSync/test/Horde/ActiveSync/TimezoneTest.php       |    1 +
 framework/Core/lib/Horde/PageOutput.php                           |   21 +-
 framework/Db/test/Horde/Db/Adapter/MysqlTest.php                  |    3 +
 framework/Db/test/Horde/Db/Adapter/MysqliTest.php                 |    3 +
 framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php              |    3 +
 framework/Icalendar/lib/Horde/Icalendar.php                       |    3 +
 framework/Icalendar/lib/Horde/Icalendar/Vtimezone.php             |    7 +-
 .../Horde/Kolab/Server/Class/Server/Connection/SimpleldapTest.php |    4 +
 .../Kolab/Server/Class/Server/Connection/SplittedldapTest.php     |    4 +
 .../Storage/ComponentTest/Data/Object/Message/ModifiedTest.php    |    3 +-
 .../Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php   |    4 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/ObjectTest.php    |    4 +-
 framework/Pdf/lib/Horde/Pdf/Writer.php                            |    7 +-
 framework/Pdf/test/Horde/Pdf/WriterTest.php                       |   10 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab.php              |    1 +
 .../Prefs/test/Horde/Prefs/Unit/Storage/KolabImapLogTest.php      |    2 +
 framework/Prefs/test/Horde/Prefs/Unit/Storage/KolabImapTest.php   |   10 +-
 framework/Share/test/Horde/Share/Kolab/MockTest.php               |    3 +
 framework/Util/lib/Horde/Domhtml.php                              |    2 +-
 framework/View/lib/Horde/View/Helper/FormTag.php                  |    3 +-
 framework/View/package.xml                                        |    4 +-
 framework/View/test/Horde/View/Helper/DebugTest.php               |    6 +-
 framework/View/test/Horde/View/Helper/FormTagTest.php             |   32 +-
 framework/View/test/Horde/View/Helper/FormTest.php                |  114 ++--
 framework/View/test/Horde/View/Helper/TagTest.php                 |   16 +-
 26 files changed, 151 insertions(+), 121 deletions(-)

http://git.horde.org/horde-git/-/commit/48c264a596e631a72f0faa211acc291f2f62b813

-----------------------------------------------------------------------

commit 235380d8cc80a8fa3f1ea30e8100a6af62e1edab
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 9 06:39:21 2013 -0700

    Move "More" actions on smartmobile message page to popup

 imp/js/smartmobile.js                      |  147 +++++++++++++++-------------
 imp/templates/smartmobile/message.html.php |   39 ++++++--
 2 files changed, 109 insertions(+), 77 deletions(-)

http://git.horde.org/horde-git/-/commit/235380d8cc80a8fa3f1ea30e8100a6af62e1edab

-----------------------------------------------------------------------

commit c93005b7ce0e4b83345a8fe3e70c1ef1fdb7bde4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 9 15:01:35 2013 -0700

    Fix updating message count when deleting last message in mailbox

 imp/js/smartmobile.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/c93005b7ce0e4b83345a8fe3e70c1ef1fdb7bde4

-----------------------------------------------------------------------

commit d08c8b7df3ce10380a48619ac0ab9d36c894bd54
Merge: c93005b 235380d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 9 15:02:04 2013 -0700

    Merge branch 'smartmobile-more' into imp_6_1

 imp/js/smartmobile.js                      |  147 +++++++++++++++-------------
 imp/templates/smartmobile/message.html.php |   39 ++++++--
 2 files changed, 109 insertions(+), 77 deletions(-)

http://git.horde.org/horde-git/-/commit/d08c8b7df3ce10380a48619ac0ab9d36c894bd54

-----------------------------------------------------------------------

commit 2cd11f091a918a33f01e17d9f2ea855e87579e89
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 9 15:03:54 2013 -0700

    Fix broken merge from master

 imp/js/smartmobile.js |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/2cd11f091a918a33f01e17d9f2ea855e87579e89

-----------------------------------------------------------------------

commit ebdab50446cb5bc853b703bb226c5df578cb6dc0
Merge: 2cd11f0 378a91d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 9 23:40:47 2013 -0700

    Merge branch 'master' into imp_6_1

 .../test/Horde/SessionHandler/Storage/BuiltinTest.php             |    8 ++
 framework/Text_Filter/lib/Horde/Text/Filter/Html2text.php         |   24 ++--
 framework/Text_Filter/package.xml                                 |    2 +
 framework/Text_Filter/test/Horde/Text/Filter/Html2textTest.php    |   13 ++-
 4 files changed, 30 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/ebdab50446cb5bc853b703bb226c5df578cb6dc0

-----------------------------------------------------------------------

commit 487bc9619826a82732a1feaec78586bbac26e075
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 10 00:28:09 2013 -0700

    [mms] Re-add alerts log to dynamic mailbox view.

 imp/docs/CHANGES                      |    1 +
 imp/js/dimpbase.js                    |   16 ++++++++--------
 imp/lib/Dynamic/Mailbox.php           |    4 ++++
 imp/package.xml                       |    2 ++
 imp/themes/default/dynamic/screen.css |    3 +++
 5 files changed, 18 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/487bc9619826a82732a1feaec78586bbac26e075

-----------------------------------------------------------------------

commit 41a80b540dbf6fb5aa6f45b4fe91cf95b6267885
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 10 00:28:38 2013 -0700

    IE7 is no longer supported for dynamic view

 imp/package.xml                    |    6 +---
 imp/themes/default/dynamic/ie7.css |   50 ------------------------------------
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 imp/themes/default/dynamic/ie7.css

http://git.horde.org/horde-git/-/commit/41a80b540dbf6fb5aa6f45b4fe91cf95b6267885

-----------------------------------------------------------------------

commit f3db74ec6f389cc7bef1e8cf1d4e6933e4f27fb3
Merge: 41a80b5 79d81c4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 10 00:46:18 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Core/test/Horde/Core/UrlTest.php                        |  242 +++--
 .../test/Horde/SessionHandler/Storage/BuiltinTest.php             |    1 +
 horde/util/icon_browser.php                                       |   79 +-
 3 files changed, 148 insertions(+), 174 deletions(-)

http://git.horde.org/horde-git/-/commit/f3db74ec6f389cc7bef1e8cf1d4e6933e4f27fb3

-----------------------------------------------------------------------

commit 5045603c5cd1f92aabe1ed2dd786a0a8cec98de2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 10 01:21:49 2013 -0700

    tempid not needed; just use regular id

 imp/js/smartmobile.js                      |   12 ++++--------
 imp/templates/smartmobile/message.html.php |   10 +++++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/5045603c5cd1f92aabe1ed2dd786a0a8cec98de2

-----------------------------------------------------------------------

commit e4db11943cf879e095dc4b91406181dba9c11aa1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 10 01:25:15 2013 -0700

    Remove duplicate attribute

 imp/templates/smartmobile/message.html.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/e4db11943cf879e095dc4b91406181dba9c11aa1

-----------------------------------------------------------------------

commit c98b096693c9e276cc1ba40bbdb30568c6a1b858
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 10 01:56:28 2013 -0700

    [mms] Spam/innocent reporting on the smartmobile message page now uses a popup instead of a modal dialog.

 imp/docs/CHANGES                           |    2 +
 imp/js/smartmobile.js                      |   95 +++++++---------------------
 imp/lib/Smartmobile.php                    |   13 ----
 imp/package.xml                            |    6 +-
 imp/templates/smartmobile/confirm.html.php |   10 ---
 imp/templates/smartmobile/message.html.php |   34 +++++++++-
 6 files changed, 60 insertions(+), 100 deletions(-)
 delete mode 100644 imp/templates/smartmobile/confirm.html.php

http://git.horde.org/horde-git/-/commit/c98b096693c9e276cc1ba40bbdb30568c6a1b858

-----------------------------------------------------------------------

commit 5dd525bb2a5f742ff8a8e1c014ad38fa53fafe86
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 00:03:48 2013 -0700

    Fix returning flag updates

 imp/lib/Ajax/Queue.php |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/5dd525bb2a5f742ff8a8e1c014ad38fa53fafe86

-----------------------------------------------------------------------

commit a0785df3a8736273c4fcef7fb9aab56bc96380a8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 00:31:21 2013 -0700

    Always require click of subnit button for copy/move in smartmobile view

 imp/js/smartmobile.js                       |   11 +----------
 imp/templates/smartmobile/copymove.html.php |    2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/a0785df3a8736273c4fcef7fb9aab56bc96380a8

-----------------------------------------------------------------------

commit 11ad55026b701d60f43076656b2bb49cb14f25e3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 00:38:26 2013 -0700

    Add overlay behind spam/innocent reporting dialog popup

 imp/templates/smartmobile/message.html.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/11ad55026b701d60f43076656b2bb49cb14f25e3

-----------------------------------------------------------------------

commit 6bceb56ce5bb251be5b17990071c9be48d681680
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 00:45:06 2013 -0700

    this is expected behavior

 imp/js/smartmobile.js |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/6bceb56ce5bb251be5b17990071c9be48d681680

-----------------------------------------------------------------------

commit da3c43710da83abeaf5edec35d83ba1597ec9199
Merge: 6bceb56 6a0d29e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 00:56:48 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Core/js/smartmobile.js                                  |    7 ++--
 framework/Core/lib/Horde/PageOutput.php                           |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/AuthTest.php         |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/MapTest.php          |    5 +++
 .../Imap_Client/test/Horde/Imap/Client/RemoteImapServerTest.php   |    7 ++++
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php       |    5 +++
 framework/Mail/test/Horde/Mail/ListTest.php                       |    5 +++
 framework/Mail/test/Horde/Mail/ParseTest.php                      |    5 +++
 framework/Mime/test/Horde/Mime/MailTest.php                       |    8 ++++-
 framework/Mime/test/Horde/Mime/RelatedTest.php                    |    5 +++
 10 files changed, 44 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/da3c43710da83abeaf5edec35d83ba1597ec9199

-----------------------------------------------------------------------

commit c444ffb64f23547f1ea5725ea6932c90ee27ac32
Merge: da3c437 7714cce
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 13:10:23 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Imap.php
    	imp/lib/Message.php

 content/package.xml                                               |   24 ++-
 framework/Cli_Modular/lib/Horde/Cli/Modular/Modules.php           |    1 +
 framework/Db/package.xml                                          |    4 +-
 framework/Icalendar/lib/Horde/Icalendar.php                       |    4 +-
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/Vilnius.ics |    4 +-
 .../test/Horde/Icalendar/fixtures/vTimezone/exchange.ics          |    4 +-
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/meeting.ics |    4 +-
 framework/Prefs/package.xml                                       |    4 +-
 framework/Vfs/package.xml                                         |    4 +-
 framework/Yaml/test/Horde/Yaml/LoaderTest.php                     |    2 +-
 horde/package.xml                                                 |   48 +++-
 imp/lib/Imap.php                                                  |   11 +-
 imp/lib/Maillog.php                                               |   25 ++-
 imp/lib/Message.php                                               |    7 +-
 imp/package.xml                                                   |   12 +-
 ingo/package.xml                                                  |   12 +-
 kronolith/package.xml                                             |   24 ++-
 nag/package.xml                                                   |   16 +-
 turba/package.xml                                                 |   24 ++-
 19 files changed, 158 insertions(+), 76 deletions(-)

http://git.horde.org/horde-git/-/commit/c444ffb64f23547f1ea5725ea6932c90ee27ac32

-----------------------------------------------------------------------

commit 8b280e342157082345b8704a67ced04d04651577
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 14:49:21 2013 -0700

    [mms] Linked attachments are no longer a user-configurable action.
    
    [mms] Attachments can now be configured to be linked only if over a configurable size threshold.

 imp/config/conf.xml                         |    8 +-
 imp/config/prefs.php                        |   12 +--
 imp/docs/CHANGES                            |    6 +-
 imp/docs/UPGRADING                          |   12 ++-
 imp/js/compose-dimp.js                      |    1 -
 imp/lib/Ajax/Application/Handler/Common.php |    9 --
 imp/lib/Basic/Compose.php                   |   30 +----
 imp/lib/Compose.php                         |  176 +++++++++++----------------
 imp/lib/Compose/Attachment.php              |   15 +++
 imp/lib/Dynamic/Compose/Common.php          |   23 +---
 imp/package.xml                             |    8 +-
 imp/templates/dynamic/compose.html.php      |    3 -
 12 files changed, 124 insertions(+), 179 deletions(-)

http://git.horde.org/horde-git/-/commit/8b280e342157082345b8704a67ced04d04651577

-----------------------------------------------------------------------

commit 032460cefa5a7163532603015f3607ee6ff840dc
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 15:21:53 2013 -0700

    Determine attachment limit on server side, not browser side

 imp/js/compose-dimp.js                |   38 ++++++++++++++++----------------
 imp/lib/Ajax/Queue.php                |   30 ++++++++++++++++---------
 imp/lib/Dynamic/Compose/Common.php    |    1 -
 imp/themes/default/dynamic/screen.css |    6 +++++
 4 files changed, 44 insertions(+), 31 deletions(-)

http://git.horde.org/horde-git/-/commit/032460cefa5a7163532603015f3607ee6ff840dc

-----------------------------------------------------------------------

commit e35032d8d164872dc82e6a005297f73234aa0035
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 15:33:00 2013 -0700

    Attachment size limitations need to be checked at attachment time to produce the correct results

 imp/lib/Basic/Compose.php                    |   14 +----
 imp/lib/Compose.php                          |   84 ++++++++++----------------
 imp/templates/basic/compose/compose.html.php |    8 +--
 3 files changed, 35 insertions(+), 71 deletions(-)

http://git.horde.org/horde-git/-/commit/e35032d8d164872dc82e6a005297f73234aa0035

-----------------------------------------------------------------------

commit 9fcc4620d9ac8bdcd2b999e835a76cb510e93b3b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 16:08:28 2013 -0700

    Hint to PHP server about max POST file size in dynamic view

 imp/js/dimpbase.js                     |    2 ++
 imp/lib/Dynamic/Base.php               |    3 ++-
 imp/lib/Dynamic/Compose/Common.php     |    1 +
 imp/templates/dynamic/compose.html.php |    1 +
 4 files changed, 6 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/9fcc4620d9ac8bdcd2b999e835a76cb510e93b3b

-----------------------------------------------------------------------

commit ca8326068c88110b79ae80ab220942eb268daf35
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 16:20:23 2013 -0700

    IMP_Compose_LinkedAttachment::create() -> IMP_Compose#createLinkedAtc()

 imp/lib/Compose.php                  |    2 +-
 imp/lib/Compose/Attachment.php       |   17 +++++++++++++++++
 imp/lib/Compose/LinkedAttachment.php |   20 --------------------
 3 files changed, 18 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/ca8326068c88110b79ae80ab220942eb268daf35

-----------------------------------------------------------------------

commit 8e5c0d19a5b6ad49bcefa360ddec7633a368f651
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 16:37:56 2013 -0700

    For pasted images, transfer to linked attachment sending if it exceeds the threshold

 imp/lib/Compose.php |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/8e5c0d19a5b6ad49bcefa360ddec7633a368f651

-----------------------------------------------------------------------

commit 827308f9d691d0c4c0e01304a1ff7a68bb222d91
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 17:30:19 2013 -0700

    [mms] Added argument to the 'trailer' hook to allow HTML trailers to be generated.

 imp/config/hooks.php.dist |   14 +++++++++++---
 imp/docs/CHANGES          |    2 ++
 imp/docs/UPGRADING        |    2 ++
 imp/lib/Compose.php       |    9 ++++++---
 imp/package.xml           |    2 ++
 5 files changed, 23 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/827308f9d691d0c4c0e01304a1ff7a68bb222d91

-----------------------------------------------------------------------

commit d303e7c1ad063ca41e447d69483f45bceec05d9c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 17:32:34 2013 -0700

    Charset conversion got lost

 imp/lib/Compose.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/d303e7c1ad063ca41e447d69483f45bceec05d9c

-----------------------------------------------------------------------

commit 2520d392493830f76e1894202a033e70357e8312
Merge: d303e7c 2e88917
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 23:06:10 2013 -0700

    Merge branch 'master' into imp_6_1

 content/docs/CHANGES                                             |    8 +-
 content/lib/Application.php                                      |    2 +-
 content/package.xml                                              |   23 +++-
 framework/Core/package.xml                                       |   28 +++-
 framework/Editor/package.xml                                     |   23 +++-
 framework/Exception/package.xml                                  |   23 +++-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/BaseSubject.php |    5 +-
 framework/Itip/package.xml                                       |   23 +++-
 framework/Mime/package.xml                                       |   23 +++-
 framework/Pdf/package.xml                                        |   21 ++-
 framework/Test/package.xml                                       |   23 +++-
 framework/Text_Filter/package.xml                                |   24 +++-
 framework/Util/lib/Horde/Domhtml.php                             |   43 +++++-
 framework/Util/package.xml                                       |   27 +++-
 framework/Util/test/Horde/Util/DomhtmlTest.php                   |   16 ++
 framework/View/package.xml                                       |   23 +++-
 gollem/docs/INSTALL                                              |    6 +-
 gollem/docs/RELEASE_NOTES                                        |   19 +--
 horde/docs/RELEASE_NOTES                                         |   12 +-
 imp/docs/RELEASE_NOTES                                           |   22 +--
 ingo/docs/CHANGES                                                |    2 +-
 ingo/docs/RELEASE_NOTES                                          |   12 +-
 kronolith/docs/RELEASE_NOTES                                     |   16 +-
 mnemo/docs/RELEASE_NOTES                                         |   12 +-
 timeobjects/docs/CHANGES                                         |    8 +-
 timeobjects/lib/Application.php                                  |    2 +-
 timeobjects/package.xml                                          |   31 +++-
 trean/docs/CHANGES                                               |    6 -
 trean/docs/INSTALL                                               |    6 +-
 trean/docs/RELEASE_NOTES                                         |   16 +--
 turba/docs/RELEASE_NOTES                                         |   14 +-
 31 files changed, 357 insertions(+), 162 deletions(-)

http://git.horde.org/horde-git/-/commit/2520d392493830f76e1894202a033e70357e8312

-----------------------------------------------------------------------

commit d254d6514ae3e5812bbd102c9caf81687c92c6fb
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 23:26:53 2013 -0700

    Manipulate HTML compose message entirely via DOMDocument

 imp/lib/Compose.php |  102 ++++++++++++++++++++++++--------------------------
 imp/package.xml     |    2 +-
 2 files changed, 50 insertions(+), 54 deletions(-)

http://git.horde.org/horde-git/-/commit/d254d6514ae3e5812bbd102c9caf81687c92c6fb

-----------------------------------------------------------------------

commit d8c2ef2c1eb7ce0c72f37a16b77f9cc661b45973
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 11 23:56:32 2013 -0700

    [mms] Add linked attachment information directly to main body text.

 imp/docs/CHANGES    |    1 +
 imp/lib/Compose.php |   98 +++++++++++++++++++++++++++-----------------------
 imp/package.xml     |    2 +
 3 files changed, 56 insertions(+), 45 deletions(-)

http://git.horde.org/horde-git/-/commit/d8c2ef2c1eb7ce0c72f37a16b77f9cc661b45973

-----------------------------------------------------------------------

commit 947400a0ace9cb5b05a04f9bc87549bdc38d60cc
Merge: d8c2ef2 5ec977a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 01:05:40 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Compose.php

 framework/Core/lib/Horde/Session.php      |   59 ++++---
 framework/Core/lib/Horde/Session/Null.php |  299 +++--------------------------
 framework/Core/package.xml                |    4 +-
 imp/lib/Compose.php                       |    5 +-
 4 files changed, 68 insertions(+), 299 deletions(-)

http://git.horde.org/horde-git/-/commit/947400a0ace9cb5b05a04f9bc87549bdc38d60cc

-----------------------------------------------------------------------

commit e3f208d08b0374d91252e3eabb0fc33358a7d3eb
Merge: 947400a 5ef6b94
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 02:20:17 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Imap_Client/lib/Horde/Imap/Client/Base.php             |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/BaseSubject.php |    5 +++--
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Sync.php        |    2 +-
 framework/Imap_Client/package.xml                                |    4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/e3f208d08b0374d91252e3eabb0fc33358a7d3eb

-----------------------------------------------------------------------

commit 14a928a947037ed9481971b7bfbb1715f41fe9d4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 02:29:55 2013 -0700

    ws

 imp/lib/Compose.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/14a928a947037ed9481971b7bfbb1715f41fe9d4

-----------------------------------------------------------------------

commit 16b4b7d1679742f3a7a6c90f52b9a155d000de2c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 02:30:03 2013 -0700

    [mms] Added the 'attach_body_check' hook.
    
    Things like signatures, trailers, and (most important) linked
    attachments may add the word "attach" into the body text. The attachment
    check necessarily needs to be done as a separate action.
    
    This is OK, since the previous code was a bit complex for the hook
    anyway.

 imp/config/hooks.php.dist |   42 ++++++++++++++++++++++--------------------
 imp/docs/CHANGES          |    1 +
 imp/docs/UPGRADING        |    4 ++++
 imp/lib/Compose.php       |   19 +++++++++++++++++++
 imp/package.xml           |    2 ++
 5 files changed, 48 insertions(+), 20 deletions(-)

http://git.horde.org/horde-git/-/commit/16b4b7d1679742f3a7a6c90f52b9a155d000de2c

-----------------------------------------------------------------------

commit 39ef3dc09d72441c10382eefa8288c239ff2381f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 03:15:08 2013 -0700

    [mms] Add the 'msg_filter' hook.

 imp/config/conf.xml       |   11 -----------
 imp/config/hooks.php.dist |   22 ++++++++++++++++++++++
 imp/docs/CHANGES          |    1 +
 imp/docs/UPGRADING        |    6 ++++++
 imp/lib/IMP.php           |   11 ++++++-----
 imp/package.xml           |   10 +++++-----
 6 files changed, 40 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/39ef3dc09d72441c10382eefa8288c239ff2381f

-----------------------------------------------------------------------

commit 85ad408550b318de445d81e278f09cb69f1b721d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 11:53:24 2013 -0700

    Missed this deletion

 imp/config/filter.txt.dist |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
 delete mode 100644 imp/config/filter.txt.dist

http://git.horde.org/horde-git/-/commit/85ad408550b318de445d81e278f09cb69f1b721d

-----------------------------------------------------------------------

commit 7241fa92b6b0f52c412468d9f94d1c7c99a52ab4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 13:19:14 2013 -0700

    Fixes caught by PHPMD

 imp/lib/Ajax/Application/Handler/Common.php  |    2 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php |    2 +-
 imp/lib/Auth.php                             |    2 +-
 imp/lib/Basic/Folders.php                    |    8 ++++----
 imp/lib/Basic/Message.php                    |   12 ++++++------
 imp/lib/Basic/Pgp.php                        |    1 -
 imp/lib/Basic/Thread.php                     |    1 -
 imp/lib/Compose.php                          |   10 ++++------
 imp/lib/Dynamic/Base.php                     |    2 +-
 imp/lib/Dynamic/Compose.php                  |    2 --
 imp/lib/Dynamic/Compose/Common.php           |    8 ++++----
 imp/lib/Factory/MailboxList.php              |    2 +-
 imp/lib/Indices/Mailbox.php                  |    2 +-
 imp/lib/Mailbox.php                          |    2 +-
 imp/lib/Message.php                          |   16 ++++++++--------
 imp/lib/Mime/Viewer/Html.php                 |    4 ++--
 imp/lib/Minimal/Compose.php                  |    2 +-
 imp/lib/Quota.php                            |    2 +-
 imp/lib/Quota/Imap.php                       |    2 +-
 imp/lib/Quota/Ui.php                         |    2 +-
 20 files changed, 39 insertions(+), 45 deletions(-)

http://git.horde.org/horde-git/-/commit/7241fa92b6b0f52c412468d9f94d1c7c99a52ab4

-----------------------------------------------------------------------

commit 396c2119011bfe8e82d621708134c3ded0d33356
Merge: 7241fa9 549aefd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 13:47:34 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/Application.php
    	imp/package.xml

 ansel/lib/Widget/Links.php                                        |    4 +-
 ansel/templates/view/image.html.php                               |   29 +-
 ansel/themes/default/screen.css                                   |   23 +-
 bundles/groupware/docs/CHANGES                                    |  144 ++++-
 bundles/groupware/docs/RELEASE_NOTES                              |   28 +-
 bundles/groupware/lib/Bundle.php                                  |    2 +-
 bundles/groupware/package.xml                                     |   33 +-
 bundles/webmail/docs/CHANGES                                      |  172 ++++-
 bundles/webmail/docs/RELEASE_NOTES                                |   49 +-
 bundles/webmail/lib/Bundle.php                                    |    2 +-
 bundles/webmail/package.xml                                       |   37 +-
 framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php       |    2 +-
 .../Date_Parser/lib/Horde/Date/Parser/Locale/Base/Timezone.php    |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |    2 -
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |    4 +-
 framework/Imap_Client/package.xml                                 |    2 +
 framework/Prefs/package.xml                                       |   24 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Words.php             |   55 +-
 framework/Text_Filter/package.xml                                 |   20 +-
 framework/Text_Filter/test/Horde/Text/Filter/WordsTest.php        |   64 ++
 gollem/docs/CHANGES                                               |    8 +-
 gollem/lib/Application.php                                        |    2 +-
 gollem/package.xml                                                |   33 +-
 horde/docs/CHANGES                                                |    8 +-
 horde/lib/Application.php                                         |    2 +-
 horde/package.xml                                                 |   35 +-
 imp/package.xml                                                   |   43 +-
 ingo/docs/CHANGES                                                 |    8 +-
 ingo/lib/Application.php                                          |    2 +-
 ingo/package.xml                                                  |   27 +-
 kronolith/docs/CHANGES                                            |    8 +-
 kronolith/lib/Application.php                                     |    2 +-
 kronolith/package.xml                                             |   29 +-
 mnemo/docs/CHANGES                                                |    8 +-
 mnemo/lib/Application.php                                         |    2 +-
 mnemo/package.xml                                                 |   25 +-
 trean/docs/CHANGES                                                |    8 +-
 trean/lib/Application.php                                         |    2 +-
 trean/package.xml                                                 |   31 +-
 turba/docs/CHANGES                                                |    8 +-
 turba/lib/Application.php                                         |    2 +-
 turba/package.xml                                                 |   25 +-
 42 files changed, 757 insertions(+), 259 deletions(-)

http://git.horde.org/horde-git/-/commit/396c2119011bfe8e82d621708134c3ded0d33356

-----------------------------------------------------------------------

commit 075e1f9114cd3cab3f6ade2033f9d5439db9633e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 13:50:58 2013 -0700

    Fix display of attach options in basic compose screen

 imp/lib/Basic/Compose.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/075e1f9114cd3cab3f6ade2033f9d5439db9633e

-----------------------------------------------------------------------

commit 7705894affc35c32e2fa78d47bb2f2353e41759e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 15:24:47 2013 -0700

    [mms] Can't add charset directly to HTML document or else DOM will alter document when generating HTML.

 framework/Util/lib/Horde/Domhtml.php           |   15 ++++++++++++---
 framework/Util/package.xml                     |    2 ++
 framework/Util/test/Horde/Util/DomhtmlTest.php |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/7705894affc35c32e2fa78d47bb2f2353e41759e

-----------------------------------------------------------------------

commit 84a280da972726b5cc286b0b7231d33548a25906
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 16:26:08 2013 -0700

    [mms] Fix replacing spellchecker elements within tables (Bug #12028).
    
    Looks like something wonky with prototypejs' update() method.

 framework/Core/js/spellchecker.js |    2 +-
 framework/Core/package.xml        |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/84a280da972726b5cc286b0b7231d33548a25906

-----------------------------------------------------------------------

commit 3246291480078667a87d0764b371d4bea5ca477c
Merge: 84a280d a76ff76
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 23:02:16 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	framework/Core/package.xml

 framework/Core/lib/Horde.php        |    4 +++-
 framework/Core/package.xml          |    2 ++
 imp/themes/default/basic/screen.css |    3 +++
 3 files changed, 8 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/3246291480078667a87d0764b371d4bea5ca477c

-----------------------------------------------------------------------

commit a05806cf915ca3ebfbb7c7d8d23f2f8417ef2101
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 13 17:12:46 2013 -0700

    Fix sending attachments

 imp/lib/Compose.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/a05806cf915ca3ebfbb7c7d8d23f2f8417ef2101

-----------------------------------------------------------------------

commit 679511e34725020c1b4e903a29d3a026b69a5f17
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 13 18:51:53 2013 -0700

    phpdoc

 imp/lib/Prefs/Identity.php                 |   26 +++++++++++++++++---------
 imp/lib/Prefs/Sort.php                     |   20 ++++++++++++++------
 imp/lib/Prefs/Sort/Fixed.php               |   20 ++++++++++++++------
 imp/lib/Prefs/Sort/Sortpref.php            |   22 +++++++++++++++-------
 imp/lib/Prefs/Special/Acl.php              |   20 ++++++++++++++------
 imp/lib/Prefs/Special/ComposeTemplates.php |   20 ++++++++++++++------
 imp/lib/Prefs/Special/Drafts.php           |   20 ++++++++++++++------
 imp/lib/Prefs/Special/Encrypt.php          |   20 ++++++++++++++------
 imp/lib/Prefs/Special/Flag.php             |   20 ++++++++++++++------
 imp/lib/Prefs/Special/HtmlSignature.php    |   20 ++++++++++++++------
 imp/lib/Prefs/Special/ImageReplacement.php |   20 ++++++++++++++------
 imp/lib/Prefs/Special/InitialPage.php      |   20 ++++++++++++++------
 imp/lib/Prefs/Special/Mailto.php           |   20 ++++++++++++++------
 imp/lib/Prefs/Special/NewmailSound.php     |   20 ++++++++++++++------
 imp/lib/Prefs/Special/PgpPrivateKey.php    |   20 ++++++++++++++------
 imp/lib/Prefs/Special/PgpPublicKey.php     |   20 ++++++++++++++------
 imp/lib/Prefs/Special/Searches.php         |   20 ++++++++++++++------
 imp/lib/Prefs/Special/Sentmail.php         |   20 ++++++++++++++------
 imp/lib/Prefs/Special/SmimePrivateKey.php  |   20 ++++++++++++++------
 imp/lib/Prefs/Special/SmimePublicKey.php   |   20 ++++++++++++++------
 imp/lib/Prefs/Special/Sourceselect.php     |   20 ++++++++++++++------
 imp/lib/Prefs/Special/Spam.php             |   20 ++++++++++++++------
 imp/lib/Prefs/Special/SpecialMboxes.php    |   20 ++++++++++++++------
 imp/lib/Prefs/Special/Trash.php            |   20 ++++++++++++++------
 24 files changed, 340 insertions(+), 148 deletions(-)

http://git.horde.org/horde-git/-/commit/679511e34725020c1b4e903a29d3a026b69a5f17

-----------------------------------------------------------------------

commit ff50de05f4f67ac2e5cc045752ec704e218f4937
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 13 19:43:29 2013 -0700

    IMP_Prefs_Sort_Fixed -> IMP_Prefs_Sort_FixedDate

 imp/lib/Factory/PrefsSort.php    |    2 +-
 imp/lib/Prefs/Sort/Fixed.php     |   77 --------------------------------------
 imp/lib/Prefs/Sort/FixedDate.php |   77 ++++++++++++++++++++++++++++++++++++++
 imp/package.xml                  |    6 +-
 4 files changed, 81 insertions(+), 81 deletions(-)
 delete mode 100644 imp/lib/Prefs/Sort/Fixed.php
 create mode 100644 imp/lib/Prefs/Sort/FixedDate.php

http://git.horde.org/horde-git/-/commit/ff50de05f4f67ac2e5cc045752ec704e218f4937

-----------------------------------------------------------------------

commit 885d1e6e2afb2071ac7847b33e417c0c898e43cd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 13 20:01:58 2013 -0700

    [mms] Disable mailbox sorting by default if the remote server does not natively support it (Bug #12001).

 imp/config/backends.php                |    9 ++++
 imp/docs/CHANGES                       |    2 +
 imp/docs/UPGRADING                     |    8 +++
 imp/lib/Imap.php                       |   17 +++++++
 imp/lib/Mailbox.php                    |   22 ++++++---
 imp/lib/Prefs/Sort/FixedDate.php       |   47 +------------------
 imp/lib/Prefs/Sort/None.php            |   78 ++++++++++++++++++++++++++++++++
 imp/lib/Prefs/Sort/Sortpref/Locked.php |   37 +++++++++++++++
 imp/package.xml                        |    1 +
 9 files changed, 169 insertions(+), 52 deletions(-)
 create mode 100644 imp/lib/Prefs/Sort/None.php
 create mode 100644 imp/lib/Prefs/Sort/Sortpref/Locked.php

http://git.horde.org/horde-git/-/commit/885d1e6e2afb2071ac7847b33e417c0c898e43cd

-----------------------------------------------------------------------

commit f26e1da815ba18e1b663529d3c58b849eb1cb8e5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 13 22:16:55 2013 -0700

    Cleanups of linked attachment code

 imp/lib/Compose/LinkedAttachment.php |   86 ++++++++++++++++++++--------------
 1 files changed, 50 insertions(+), 36 deletions(-)

http://git.horde.org/horde-git/-/commit/f26e1da815ba18e1b663529d3c58b849eb1cb8e5

-----------------------------------------------------------------------

commit 562ca57f4bd269e821c9fff25fc43d0eded35aef
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 13 22:43:40 2013 -0700

    Add link_attach_vfs hook
    
    Allows a installation to do something like create their own VFS driver
    to allow for cloud storage in their local system.

 imp/config/hooks.php.dist            |   21 +++++++++++++++++++++
 imp/docs/UPGRADING                   |    2 +-
 imp/lib/Compose/LinkedAttachment.php |    7 ++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/562ca57f4bd269e821c9fff25fc43d0eded35aef

-----------------------------------------------------------------------

commit 49f413c567f88bec0bad53f9d3e3c7b656cf297e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 14 00:17:26 2013 -0700

    Better display of Hide/Show Addresses link

 imp/lib/Message/Ui.php                |    4 ++--
 imp/templates/dynamic/header.html.php |    6 +++---
 imp/themes/default/screen.css         |    5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/49f413c567f88bec0bad53f9d3e3c7b656cf297e

-----------------------------------------------------------------------

commit fb183919f7cc6dccace91471016d2ea3b4dcbfbf
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 16 21:52:42 2013 -0700

    Fix class name

 imp/lib/Factory/PrefsSort.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/fb183919f7cc6dccace91471016d2ea3b4dcbfbf

-----------------------------------------------------------------------

commit bf0a7d249dd6f9295b1da6f60da6736b048be5e2
Merge: fb18391 1f5bc54
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 16 22:14:17 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Imap.php

 .travis.yml                                                       |   11 +-
 ansel/lib/Ansel.php                                               |    6 +-
 ansel/lib/Tile/DateGallery.php                                    |    1 +
 ansel/lib/View/GalleryRenderer/GalleryLightbox.php                |   24 +
 components/data/qc_standards/phpmd.xml                            |    1 +
 components/lib/Components/Module/Qc.php                           |    2 +
 components/lib/Components/Qc/Task/Base.php                        |    2 +-
 components/lib/Components/Qc/Task/Cpd.php                         |   10 +-
 components/lib/Components/Qc/Task/Cs.php                          |    5 +-
 components/lib/Components/Qc/Task/Dcd.php                         |   79 ++
 components/lib/Components/Qc/Task/Lint.php                        |    2 +-
 components/lib/Components/Qc/Task/Loc.php                         |   73 ++
 components/lib/Components/Qc/Task/Md.php                          |    2 +-
 components/lib/Components/Qc/Task/Unit.php                        |   13 +-
 components/lib/Components/Qc/Tasks.php                            |    2 +-
 components/lib/Components/Runner/Qc.php                           |    8 +
 components/package.xml                                            |   40 +-
 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php           |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Utils.php               |   12 +-
 framework/ActiveSync/test/Horde/ActiveSync/InviteTest.php         |    1 +
 .../test/Horde/ActiveSync/StateTest/Sql/Pdo/MysqlTest.php         |    2 +
 framework/ActiveSync/test/Horde/ActiveSync/conf.php.dist          |   46 +-
 framework/Alarm/test/Horde/Alarm/HandlerTest.php                  |    4 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |    2 +
 framework/Core/package.xml                                        |    2 +
 framework/Crypt/lib/Horde/Crypt/Pgp.php                           |    2 +-
 framework/Crypt/package.xml                                       |    8 +-
 framework/Crypt/test/Horde/Crypt/PgpKeyserverTest.php             |    7 +-
 framework/Crypt/test/Horde/Crypt/conf.php.dist                    |    2 +
 framework/Date/lib/Horde/Date.php                                 |   14 +-
 framework/Date/lib/Horde/Date/Recurrence.php                      |   19 +-
 framework/Date/package.xml                                        |    4 +-
 framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php       |    2 +-
 .../Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater.php    |   76 +-
 .../Date_Parser/lib/Horde/Date/Parser/Locale/Base/Timezone.php    |    2 +-
 framework/Date_Parser/test/Horde/Date/Parser/ParserTest.php       |    1 -
 framework/Date_Parser/test/Horde/Date/Parser/TokenTest.php        |   31 +-
 framework/Db/lib/Horde/Db/Adapter/Pdo/Pgsql.php                   |    2 +-
 framework/Group/test/Horde/Group/LdapTest.php                     |    7 +-
 framework/Group/test/Horde/Group/Sql/MysqlTest.php                |    2 +
 framework/Group/test/Horde/Group/Sql/MysqliTest.php               |    2 +
 framework/Group/test/Horde/Group/Sql/Pdo/MysqlTest.php            |    2 +
 framework/Group/test/Horde/Group/Sql/Pdo/PgsqlTest.php            |    2 +
 .../test/Horde/Icalendar/fixtures/vTimezone/exchange.ics          |    4 +-
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/meeting.ics |    4 +-
 framework/Image/package.xml                                       |   12 +-
 framework/Image/test/Horde/Image/Exif/Base.php                    |   75 --
 framework/Image/test/Horde/Image/Exif/BundledTest.php             |   15 +-
 framework/Image/test/Horde/Image/Exif/ExiftoolTest.php            |   18 +-
 framework/Image/test/Horde/Image/Exif/PhpTest.php                 |   15 +-
 framework/Image/test/Horde/Image/Exif/TestBase.php                |   72 ++
 framework/Image/test/Horde/Image/Fixtures/img_exif.jpg            |  Bin 181131 -> 181401 bytes
 .../test/Horde/Kolab/Format/Unit/Xml/Type/DateTimeTest.php        |    9 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/AttachmentTest.php     |    3 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Msexcel.php           |   22 +-
 framework/Mime_Viewer/package.xml                                 |    4 +-
 framework/Pear/test/Horde/Pear/Server/RemoteTest.php              |    4 +-
 framework/Pear/test/Horde/Pear/Server/RestTest.php                |    2 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab.php              |   57 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/Acl/Anonymous.php      |   17 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl/Anyone.php   |   17 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl/Group.php    |   30 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl/User.php     |   22 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/AclIterator.php  |   17 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Element.php      |   14 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/Element/Default.php    |   12 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/Element/Group.php      |   16 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/Element/Guest.php      |   12 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Element/User.php |   15 +-
 .../Perms/lib/Horde/Perms/Permission/Kolab/ElementIterator.php    |   15 +-
 framework/Perms/lib/Horde/Perms/Permission/Kolab/Storage.php      |   10 +-
 framework/Perms/package.xml                                       |   18 +-
 framework/Prefs/lib/Horde/Prefs/Identity.php                      |   10 +-
 framework/Prefs/package.xml                                       |   21 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/MysqlTest.php   |    2 +
 framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/MysqliTest.php  |    2 +
 .../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/MysqlTest.php     |    2 +
 .../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/PgsqlTest.php     |    2 +
 framework/Rdo/package.xml                                         |    8 +-
 .../Service_Gravatar/test/Horde/Service/Gravatar/ServerTest.php   |   15 +-
 .../test/Horde/SessionHandler/Storage/MemcacheTest.php            |    5 +-
 .../test/Horde/SessionHandler/Storage/Sql/Pdo/MysqlTest.php       |    2 +
 .../test/Horde/SessionHandler/Storage/Sql/Pdo/PgsqlTest.php       |    2 +
 .../test/Horde/SessionHandler/Storage/StackTest.php               |    5 +-
 framework/Share/lib/Horde/Share/Object.php                        |    5 +-
 framework/Share/lib/Horde/Share/Object/Kolab.php                  |    6 +-
 framework/Share/package.xml                                       |    6 +-
 framework/Share/test/Horde/Share/Kolab/MockTest.php               |    3 -
 framework/Share/test/Horde/Share/Kolab/UnitTest.php               |   12 +-
 framework/Share/test/Horde/Share/Sql/Base.php                     |    4 +-
 framework/Share/test/Horde/Share/Sql/MysqlTest.php                |    3 +
 framework/Share/test/Horde/Share/Sql/MysqliTest.php               |    3 +
 framework/Share/test/Horde/Share/Sql/Pdo/MysqlTest.php            |    3 +
 framework/Share/test/Horde/Share/Sql/Pdo/PgsqlTest.php            |    3 +
 framework/Share/test/Horde/Share/Sqlng/Base.php                   |    4 +-
 framework/Share/test/Horde/Share/Sqlng/MysqlTest.php              |    3 +
 framework/Share/test/Horde/Share/Sqlng/MysqliTest.php             |    3 +
 framework/Share/test/Horde/Share/Sqlng/Pdo/MysqlTest.php          |    3 +
 framework/Share/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php          |    3 +
 framework/Share/test/Horde/Share/TestBase.php                     |    8 +-
 framework/Support/test/Horde/Support/GuidTest.php                 |    5 +-
 framework/Support/test/Horde/Support/InflectorTest.php            |    6 +-
 framework/Test/lib/Horde/Test/AllTests.php                        |   11 +-
 framework/Util/lib/Horde/Domhtml.php                              |    3 +
 framework/Vcs/package.xml                                         |    8 +-
 framework/Vcs/test/Horde/Vcs/CvsTest.php                          |    2 +-
 framework/Vcs/test/Horde/Vcs/GitTest.php                          |    2 +-
 framework/Vcs/test/Horde/Vcs/RcsTest.php                          |    2 +-
 framework/Vcs/test/Horde/Vcs/SvnTest.php                          |    2 +-
 framework/Vcs/test/Horde/Vcs/TestBase.php                         |    5 +-
 framework/Vcs/test/Horde/Vcs/conf.php.dist                        |   12 +
 framework/Vfs/lib/Horde/Vfs/Ftp.php                               |   25 -
 framework/Vfs/lib/Horde/Vfs/SqlFile.php                           |    5 +-
 framework/Vfs/lib/Horde/Vfs/Ssh2.php                              |    2 +-
 framework/Vfs/test/Horde/Vfs/FileTest.php                         |    2 +-
 framework/Vfs/test/Horde/Vfs/FtpTest.php                          |    2 +
 framework/Vfs/test/Horde/Vfs/SmbTest.php                          |    2 +
 framework/Vfs/test/Horde/Vfs/Sql/MysqlTest.php                    |    2 +
 framework/Vfs/test/Horde/Vfs/Sql/MysqliTest.php                   |    2 +
 framework/Vfs/test/Horde/Vfs/Sql/Pdo/MysqlTest.php                |    2 +
 framework/Vfs/test/Horde/Vfs/Sql/Pdo/PgsqlTest.php                |    2 +
 framework/Vfs/test/Horde/Vfs/Ssh2Test.php                         |    2 +
 framework/Yaml/lib/Horde/Yaml/Dumper.php                          |  115 ++--
 framework/Yaml/lib/Horde/Yaml/Loader.php                          |  184 +++--
 framework/Yaml/package.xml                                        |    4 +-
 framework/Yaml/test/Horde/Yaml/DumperTest.php                     |    4 -
 framework/Yaml/test/Horde/Yaml/LoaderTest.php                     |    9 +-
 hermes/js/hermes.js                                               |    3 +-
 imp/templates/smartmobile/search.html.php                         |    2 +-
 kronolith/docs/CHANGES                                            |    1 +
 kronolith/lib/Driver.php                                          |    3 +-
 kronolith/lib/Driver/Resource/Sql.php                             |   52 +-
 kronolith/lib/Event.php                                           |    2 +-
 kronolith/lib/Event/Sql.php                                       |   11 +-
 kronolith/package.xml                                             |    4 +-
 skeleton/lib/Ajax/Application.php                                 |   22 +-
 skeleton/lib/Api.php                                              |   22 +-
 skeleton/lib/Application.php                                      |   21 +-
 skeleton/lib/Block/Example.php                                    |    5 +-
 skeleton/lib/Driver.php                                           |   19 +-
 skeleton/lib/Driver/Sql.php                                       |   12 +-
 skeleton/lib/Exception.php                                        |   11 +-
 skeleton/lib/Factory/Driver.php                                   |   11 +-
 skeleton/lib/Test.php                                             |   16 +-
 144 files changed, 1110 insertions(+), 745 deletions(-)

http://git.horde.org/horde-git/-/commit/bf0a7d249dd6f9295b1da6f60da6736b048be5e2

-----------------------------------------------------------------------

commit 6a69fc5b00e52a4c6a06cf5fa3114449cc230333
Merge: bf0a7d2 c5fafd7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 16 23:26:30 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Imap.php


http://git.horde.org/horde-git/-/commit/6a69fc5b00e52a4c6a06cf5fa3114449cc230333

-----------------------------------------------------------------------

commit 6c1d57b8dccd91192b21042c13dddbf508a6d92c
Merge: 6a69fc5 044bbf0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 17 17:15:35 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Core/lib/Horde/Session.php                     |    6 +
 framework/Core/package.xml                               |    2 +
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING    |    8 ++
 framework/Imap_Client/lib/Horde/Imap/Client/Ids.php      |   23 +++++
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php   |   68 ++++++++------
 framework/Imap_Client/package.xml                        |   12 ++-
 framework/Imap_Client/test/Horde/Imap/Client/IdsTest.php |   33 +++++++
 framework/Util/package.xml                               |   24 ++++-
 8 files changed, 138 insertions(+), 38 deletions(-)

http://git.horde.org/horde-git/-/commit/6c1d57b8dccd91192b21042c13dddbf508a6d92c

-----------------------------------------------------------------------

commit d6633579690bbfce60d5fc8dd700257465b9dc68
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 17 18:19:46 2013 -0700

    Fix displaying innocent button in popup message display

 imp/lib/Dynamic/Message.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/d6633579690bbfce60d5fc8dd700257465b9dc68

-----------------------------------------------------------------------

commit a713567899fa95ed3c57c69944e0d451f9cabc21
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 17 18:38:45 2013 -0700

    Improved handling of spam/innocent actions in dynamic views

 imp/js/dimpbase.js                        |   21 +++------------------
 imp/js/smartmobile.js                     |   14 +++++++++-----
 imp/lib/Ajax/Application/ListMessages.php |   18 +++++++++++++-----
 imp/lib/Dynamic/Mailbox.php               |    4 +---
 imp/lib/Smartmobile.php                   |    5 +----
 5 files changed, 27 insertions(+), 35 deletions(-)

http://git.horde.org/horde-git/-/commit/a713567899fa95ed3c57c69944e0d451f9cabc21

-----------------------------------------------------------------------

commit 68241f50b33b6994777d6c335e324c208f4e92fd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 17 19:49:18 2013 -0700

    Make sure this value exists

 imp/js/compose-dimp.js |    2 +-
 imp/js/dimpbase.js     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/68241f50b33b6994777d6c335e324c208f4e92fd

-----------------------------------------------------------------------

commit 8708e995ed3dd5ea3accd8f24b347d49c757eea9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 17 21:05:02 2013 -0700

    Cache prefto value

 imp/lib/Mailbox.php |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/8708e995ed3dd5ea3accd8f24b347d49c757eea9

-----------------------------------------------------------------------

commit e130e9a76aec6d2709992cff548e769faec1d9f4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 17 21:08:42 2013 -0700

    Do fixed mailbox check on server side, not browser

 imp/js/dimpbase.js          |    4 ++--
 imp/lib/Dynamic/Mailbox.php |    3 ---
 imp/lib/Imap/Tree.php       |    6 ++++++
 3 files changed, 8 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/e130e9a76aec6d2709992cff548e769faec1d9f4

-----------------------------------------------------------------------

commit 802ab9436912cd1e03fabb34cf22dcb5fe782de1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 17 21:59:33 2013 -0700

    Convert script to Horde_Argv

 imp/bin/imp-query-imap-cache |   60 ++++++++++++-----------------------------
 imp/package.xml              |    7 +++++
 2 files changed, 25 insertions(+), 42 deletions(-)

http://git.horde.org/horde-git/-/commit/802ab9436912cd1e03fabb34cf22dcb5fe782de1

-----------------------------------------------------------------------

commit bb568970a013923e1024ab82c20f66d4f74dcc54
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 17 22:28:33 2013 -0700

    This is handled by horde

 imp/package.xml |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/bb568970a013923e1024ab82c20f66d4f74dcc54

-----------------------------------------------------------------------

commit 6543be6a8d972f913fb9e1e4f87d56248a5a6bec
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 00:58:29 2013 -0700

    Fix providing initial information to smartmobile view

 imp/js/smartmobile.js                     |    2 ++
 imp/lib/Ajax/Application/ListMessages.php |    4 +++-
 2 files changed, 5 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/6543be6a8d972f913fb9e1e4f87d56248a5a6bec

-----------------------------------------------------------------------

commit 0303844647b7ac2ab63b70b08ecc7e8fef5bb6eb
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 00:58:50 2013 -0700

    Experiment without page transitions, since they are broken on various mobile browsers

 imp/js/smartmobile.js |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/0303844647b7ac2ab63b70b08ecc7e8fef5bb6eb

-----------------------------------------------------------------------

commit 8132d5a3521d6ad89cfbbadb00eb4498e5268845
Merge: 0303844 016e728
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 01:29:36 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Core/js/hordecore.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/8132d5a3521d6ad89cfbbadb00eb4498e5268845

-----------------------------------------------------------------------

commit 171263d0060969c413dbea0575a690d8daf1d013
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 01:51:03 2013 -0700

    Better check

 imp/lib/Imap.php |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/171263d0060969c413dbea0575a690d8daf1d013

-----------------------------------------------------------------------

commit 8c17ef15baf46d9cc2646899b769439fb04fe9b1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 17:41:54 2013 -0700

    Fix action name

 imp/js/compose-dimp.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8c17ef15baf46d9cc2646899b769439fb04fe9b1

-----------------------------------------------------------------------

commit fe22750a5d0bc242115fd5b8a74e54c12c38f0da
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 18:14:37 2013 -0700

    Improved handling of forwarded attachment

 imp/js/compose-dimp.js                       |   47 ++++++++++---------------
 imp/lib/Ajax/Application/Handler/Common.php  |    3 +-
 imp/lib/Ajax/Queue.php                       |   12 +++---
 imp/lib/Basic/Compose.php                    |    4 +-
 imp/lib/Dynamic/Compose.php                  |    7 ----
 imp/templates/basic/compose/compose.html.php |    7 ----
 imp/themes/default/dynamic/screen.css        |    3 --
 7 files changed, 28 insertions(+), 55 deletions(-)

http://git.horde.org/horde-git/-/commit/fe22750a5d0bc242115fd5b8a74e54c12c38f0da

-----------------------------------------------------------------------

commit cc2fb8f3761f2c8f2fbb3623a04e403f8453f06e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 18:31:37 2013 -0700

    Fix changing sort

 imp/lib/Mailbox.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/cc2fb8f3761f2c8f2fbb3623a04e403f8453f06e

-----------------------------------------------------------------------

commit 56d857ed174ee24f5015c9701c26c7a29be21a3f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 18:49:58 2013 -0700

    More robust handling of errors when removing an attachment

 imp/js/compose-dimp.js                       |   43 +++++++++++++++----------
 imp/lib/Ajax/Application/Handler/Dynamic.php |   17 ++++++++--
 2 files changed, 39 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/56d857ed174ee24f5015c9701c26c7a29be21a3f

-----------------------------------------------------------------------

commit 74d46d6a12bb871475d76d82b32d4bb455e70522
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 18:51:23 2013 -0700

    Fix the actual deletion of the attachment

 imp/js/compose-dimp.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/74d46d6a12bb871475d76d82b32d4bb455e70522

-----------------------------------------------------------------------

commit ab16477f3e4666bd41df361dc0867c6b67e28a5e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 19:22:10 2013 -0700

    jsfixes caught by jshint

 imp/js/compose-dimp.js  |   46 ++++++++++++++++++++++------------------------
 imp/js/compose.js       |    7 +++----
 imp/js/dimpbase.js      |   36 +++++++++++++++++-------------------
 imp/js/dimpcore.js      |    2 +-
 imp/js/flagprefs.js     |    2 +-
 imp/js/folders.js       |    2 +-
 imp/js/mailbox.js       |   10 +++++-----
 imp/js/message-dimp.js  |    4 ++--
 imp/js/message.js       |    8 ++++----
 imp/js/pgp.js           |    2 +-
 imp/js/search.js        |    2 +-
 imp/js/searchesprefs.js |    2 +-
 imp/js/signaturehtml.js |    2 +-
 imp/js/smartmobile.js   |   32 ++++++++++++++++----------------
 imp/js/viewport.js      |   14 ++++++++------
 15 files changed, 84 insertions(+), 87 deletions(-)

http://git.horde.org/horde-git/-/commit/ab16477f3e4666bd41df361dc0867c6b67e28a5e

-----------------------------------------------------------------------

commit 36dc97910b35607050ca9dc34b0ea4a529162f2a
Merge: ab16477 444726c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 20:21:45 2013 -0700

    Merge branch 'master' into imp_6_1

 .travis.yml                                                       |    8 +-
 chora/commit.php                                                  |    5 +-
 chora/patchsets.php                                               |    2 +-
 framework/Argv/doc/Horde/Argv/ADVANCED                            |  397 +++++
 framework/Argv/doc/Horde/Argv/CALLBACKS                           |  237 +++
 framework/Argv/doc/Horde/Argv/DOCS_ORIGIN                         |   17 +
 framework/Argv/doc/Horde/Argv/EXTEND                              |  157 ++
 framework/Argv/doc/Horde/Argv/README                              |  309 ++++
 framework/Argv/lib/Horde/Argv/Option.php                          |  102 +-
 framework/Argv/package.xml                                        |   20 +-
 framework/Core/js/accesskeys.js                                   |    9 +-
 framework/Core/js/autocomplete.js                                 |    2 +-
 framework/Core/js/calendar.js                                     |   12 +-
 framework/Core/js/colorpicker.js                                  |   18 +-
 framework/Core/js/date/date.js                                    |  128 +-
 framework/Core/js/dialog.js                                       |    4 +-
 framework/Core/js/form_assign.js                                  |  118 +-
 framework/Core/js/form_helpers.js                                 |   12 +-
 framework/Core/js/growler-jquery.js                               |    4 +-
 framework/Core/js/growler.js                                      |   40 +-
 framework/Core/js/horde-jquery.js                                 |    4 +-
 framework/Core/js/horde.js                                        |    6 +-
 framework/Core/js/hordecore.js                                    |    2 +-
 framework/Core/js/hordetree.js                                    |    8 +-
 framework/Core/js/liquidmetal.js                                  |    2 +-
 framework/Core/js/prettyautocomplete.js                           |   10 +-
 framework/Core/js/smartmobile.js                                  |    2 +-
 framework/Core/js/sorter.js                                       |   16 +-
 framework/Core/js/spellchecker.js                                 |    2 +-
 framework/Core/js/tables.js                                       |    8 +-
 framework/Core/js/tooltips.js                                     |    2 +-
 .../Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php   |    2 +
 framework/Mime_Viewer/js/syntaxhighlighter/src/shCore.js          |    8 +-
 framework/Vcs/lib/Horde/Vcs/Base.php                              |   13 +-
 framework/Vcs/lib/Horde/Vcs/Cvs.php                               |    9 +-
 framework/Vcs/lib/Horde/Vcs/Patchset/Cvs.php                      |   26 +-
 framework/Vcs/test/Horde/Vcs/CvsTest.php                          |   14 +-
 framework/Vcs/test/Horde/Vcs/RcsTest.php                          |    6 +-
 imp/docs/CHANGES                                                  |    6 +-
 ingo/docs/CHANGES                                                 |    2 +
 ingo/lib/Script/Sieve.php                                         |   11 +-
 ingo/package.xml                                                  |   10 +-
 42 files changed, 1467 insertions(+), 303 deletions(-)

http://git.horde.org/horde-git/-/commit/36dc97910b35607050ca9dc34b0ea4a529162f2a

-----------------------------------------------------------------------

commit ff6783801bfc7eeaae86ad871de3e7ef8805c55a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 22:10:54 2013 -0700

    Fix copy/move regression in smartmobile view

 imp/js/smartmobile.js |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/ff6783801bfc7eeaae86ad871de3e7ef8805c55a

-----------------------------------------------------------------------

commit 82b82aba289c139edb079eefddfbbea005f4e649
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 22:13:11 2013 -0700

    Always ask for initial viewport return when needed

 imp/js/smartmobile.js |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/82b82aba289c139edb079eefddfbbea005f4e649

-----------------------------------------------------------------------

commit 8b9b94e1f80f07d3febb0f6f5134ad0479229f7a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 22:15:51 2013 -0700

    Better placeholder text for folder filter

 imp/templates/smartmobile/folders.html.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8b9b94e1f80f07d3febb0f6f5134ad0479229f7a

-----------------------------------------------------------------------

commit b786e98e792e1c9a6c74d05f3bdcadd569d6d440
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 22:51:34 2013 -0700

    We've already done this check

 imp/lib/Imap/Tree.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/b786e98e792e1c9a6c74d05f3bdcadd569d6d440

-----------------------------------------------------------------------

commit f47e4048d3b58cbe6cf18d76c27cdfc2fceda1e7
Merge: b786e98 c780574
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 23:04:37 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 imp/docs/CHANGES      |    8 ++++++++
 imp/lib/Imap/Tree.php |   17 ++++++++++++-----
 imp/package.xml       |   13 +++++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/f47e4048d3b58cbe6cf18d76c27cdfc2fceda1e7

-----------------------------------------------------------------------

commit b226d2eaf75f9680779acad51415d84ccffb8dcb
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 18 23:59:18 2013 -0700

    This got lost somewhere

 imp/package.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/b226d2eaf75f9680779acad51415d84ccffb8dcb

-----------------------------------------------------------------------

commit 1195c8230adb5113a7838be0784edd1049e061ad
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 00:01:15 2013 -0700

    Clearer

 imp/lib/Ajax/Application.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/1195c8230adb5113a7838be0784edd1049e061ad

-----------------------------------------------------------------------

commit acd7a040c86187aa3b64e841f2c149ec0c195373
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 00:17:17 2013 -0700

    Setup drag/drop attachments just once per page

 imp/js/dimpbase.js |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/acd7a040c86187aa3b64e841f2c149ec0c195373

-----------------------------------------------------------------------

commit e3409f38d92db91d58cc062ee9d3f1a58aebdfc0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 00:23:46 2013 -0700

    More efficient mouseover handler

 imp/js/dimpbase.js |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/e3409f38d92db91d58cc062ee9d3f1a58aebdfc0

-----------------------------------------------------------------------

commit abab7835942af4556261e3fbe94dcd3bd954eba8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 00:53:23 2013 -0700

    More optimizations to event handlers

 imp/js/dimpbase.js                            |    2 +-
 imp/js/flagprefs.js                           |   10 ++++------
 imp/js/folderprefs.js                         |   15 +++------------
 imp/js/folders.js                             |   12 +-----------
 imp/js/mailbox.js                             |    9 +--------
 imp/templates/prefs/composetemplates.html.php |    2 +-
 imp/templates/prefs/drafts.html.php           |    2 +-
 imp/templates/prefs/sentmail.html.php         |    2 +-
 imp/templates/prefs/spam.html.php             |    2 +-
 imp/templates/prefs/trash.html.php            |    2 +-
 10 files changed, 15 insertions(+), 43 deletions(-)

http://git.horde.org/horde-git/-/commit/abab7835942af4556261e3fbe94dcd3bd954eba8

-----------------------------------------------------------------------

commit 5b33c26a4e251e437d8b3ef6ce7c9413b73b7c18
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 01:13:18 2013 -0700

    float is reserved - use cssFloat instead

 imp/js/viewport.js |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/5b33c26a4e251e437d8b3ef6ce7c9413b73b7c18

-----------------------------------------------------------------------

commit 50797de0fb4103e3efb5df160cecb5ecb4f72c28
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 01:14:31 2013 -0700

    Fix undefined variable

 imp/js/pgp.js |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/50797de0fb4103e3efb5df160cecb5ecb4f72c28

-----------------------------------------------------------------------

commit 262813b68d00225a91ef514a930517030bca0d19
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 01:14:36 2013 -0700

    js cleanups

 imp/js/dimpbase.js    |   14 ++++----------
 imp/js/search.js      |    9 ++++-----
 imp/js/smartmobile.js |    2 --
 imp/js/viewport.js    |    4 ++--
 4 files changed, 10 insertions(+), 19 deletions(-)

http://git.horde.org/horde-git/-/commit/262813b68d00225a91ef514a930517030bca0d19

-----------------------------------------------------------------------

commit 0caa43aef2fa8cb8e2e2ae1ce4f1dd4d4095f16a
Merge: 262813b 59d222e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 01:38:43 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Core/js/colorpicker.js        |    4 ++--
 framework/Core/js/form_helpers.js       |   10 +++++-----
 framework/Core/js/growler.js            |    4 ++--
 framework/Core/js/horde-jquery.js       |    4 ++--
 framework/Core/js/hordecore.js          |   10 ++++++----
 framework/Core/js/hordetree.js          |    2 +-
 framework/Core/js/image.js              |    8 ++++----
 framework/Core/js/prettyautocomplete.js |   20 +++++++++++---------
 framework/Core/js/sorter.js             |   12 ++++++------
 framework/Core/js/spellchecker.js       |    2 --
 framework/Core/js/tables.js             |   12 ++++++------
 horde/js/contextsensitive.js            |    6 +++---
 horde/js/dragdrop2.js                   |    2 +-
 horde/js/facebookclient.js              |    4 ++--
 horde/js/form_sections.js               |    6 +++---
 horde/js/quickfinder.js                 |   17 +++++++++--------
 horde/js/twitterclient.js               |   16 ++++++++--------
 horde/js/vatid.js                       |    3 +--
 18 files changed, 72 insertions(+), 70 deletions(-)

http://git.horde.org/horde-git/-/commit/0caa43aef2fa8cb8e2e2ae1ce4f1dd4d4095f16a

-----------------------------------------------------------------------

commit 3e0a92db563cdd715bd759053c9ab7fa3f747f06
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 13:17:02 2013 -0700

    Consistency/cleanups in prefs descriptions

 imp/config/prefs.php |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/3e0a92db563cdd715bd759053c9ab7fa3f747f06

-----------------------------------------------------------------------

commit c3301590f12a9759dad4581634e2a5de08f21689
Merge: 3e0a92d 325ad37
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 18:26:12 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/attachment.php
    	imp/docs/CHANGES
    	imp/lib/Contents.php
    	imp/lib/IMP.php
    	imp/lib/Message.php
    	imp/message.php
    	imp/package.xml
    	imp/thread.php

 ansel/lib/View/GalleryRenderer/Base.php                           |   32 ++-
 ansel/lib/View/GalleryRenderer/GalleryLightbox.php                |   22 +--
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php        |    1 -
 framework/Auth/lib/Horde/Auth.php                                 |   16 +-
 framework/Auth/lib/Horde/Auth/Auto.php                            |   28 ++-
 framework/Auth/lib/Horde/Auth/Base.php                            |   44 ++--
 framework/Auth/lib/Horde/Auth/Composite.php                       |   20 ++-
 framework/Auth/lib/Horde/Auth/Customsql.php                       |   21 ++-
 framework/Auth/lib/Horde/Auth/Cyrsql.php                          |   22 ++-
 framework/Auth/lib/Horde/Auth/Exception.php                       |   14 +-
 framework/Auth/lib/Horde/Auth/Ftp.php                             |   16 +-
 framework/Auth/lib/Horde/Auth/Http.php                            |   19 ++-
 framework/Auth/lib/Horde/Auth/Http/Remote.php                     |   15 +-
 framework/Auth/lib/Horde/Auth/Imap.php                            |   19 ++-
 framework/Auth/lib/Horde/Auth/Ipbasic.php                         |   43 ++--
 framework/Auth/lib/Horde/Auth/Kolab.php                           |   19 ++-
 framework/Auth/lib/Horde/Auth/Ldap.php                            |   23 ++-
 framework/Auth/lib/Horde/Auth/Msad.php                            |   23 ++-
 framework/Auth/lib/Horde/Auth/Pam.php                             |   19 +-
 framework/Auth/lib/Horde/Auth/Passwd.php                          |   20 ++-
 framework/Auth/lib/Horde/Auth/Peclsasl.php                        |   19 +-
 framework/Auth/lib/Horde/Auth/Radius.php                          |   19 +-
 framework/Auth/lib/Horde/Auth/Shibboleth.php                      |   29 ++-
 framework/Auth/lib/Horde/Auth/Smb.php                             |   20 ++-
 framework/Auth/lib/Horde/Auth/Smbclient.php                       |   16 +-
 framework/Auth/lib/Horde/Auth/Sql.php                             |   25 ++-
 framework/Auth/lib/Horde/Auth/Translation.php                     |   13 +-
 framework/Auth/migration/Horde/Auth/1_horde_auth_base_tables.php  |    6 +
 framework/Cli_Modular/lib/Horde/Cli/Modular/Modules.php           |   52 +----
 framework/Core/js/hordecore.js                                    |   15 +-
 framework/Core/lib/Horde.php                                      |   42 ++++
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |    6 -
 framework/Core/lib/Horde/Core/ActiveSync/Imap/Factory.php         |   14 +-
 framework/Core/package.xml                                        |   14 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Namespace.php    |   52 +----
 .../Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php   |    3 +-
 framework/Prefs/lib/Horde/Prefs/Scope.php                         |   29 +--
 framework/Queue/package.xml                                       |   32 ++-
 .../Service_Gravatar/test/Horde/Service/Gravatar/ServerTest.php   |    2 +-
 framework/Support/lib/Horde/Support/Array.php                     |   39 +---
 framework/Support/test/Horde/Support/ArrayTest.php                |    4 +-
 framework/Util/lib/Horde/Variables.php                            |   51 ++---
 framework/Vfs/test/Horde/Vfs/FileTest.php                         |   31 +++
 imp/docs/CHANGES                                                  |    2 +
 imp/dynamic.php                                                   |    2 +-
 imp/lib/Basic/Message.php                                         |    8 +-
 imp/lib/Basic/Thread.php                                          |    4 +-
 imp/lib/Contents.php                                              |   17 ++-
 imp/lib/IMP.php                                                   |   22 --
 imp/lib/Message.php                                               |   14 +-
 imp/lib/Mime/Viewer/Pgp.php                                       |    2 +-
 imp/lib/Mime/Viewer/Smime.php                                     |    2 +-
 imp/minimal.php                                                   |    2 +-
 imp/package.xml                                                   |    3 +-
 trean/bin/trean-backfill-remove-utm-params                        |    2 +-
 trean/bin/trean-url-checker                                       |    2 +-
 trean/docs/CHANGES                                                |    1 +
 trean/lib/Queue/Task/Crawl.php                                    |    2 +-
 trean/lib/Queue/Task/Favicon.php                                  |    2 +-
 trean/package.xml                                                 |   18 +-
 60 files changed, 608 insertions(+), 466 deletions(-)

http://git.horde.org/horde-git/-/commit/c3301590f12a9759dad4581634e2a5de08f21689

-----------------------------------------------------------------------

commit b48ace5042184452b0f1e1d0f3496351e478e92e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 18:33:09 2013 -0700

    Need to do even more housekeeping in IMP 6.1 when stripping a part (Bug #12058)

 imp/lib/Ajax/Application/Handler/Dynamic.php |   16 +++++++++-----
 imp/lib/Basic/Message.php                    |   13 +++++++----
 imp/lib/Dynamic/Message.php                  |    8 ++++--
 imp/lib/Indices/Mailbox.php                  |   29 ++++++++++++++++++-------
 imp/lib/Message.php                          |    5 +++-
 5 files changed, 48 insertions(+), 23 deletions(-)

http://git.horde.org/horde-git/-/commit/b48ace5042184452b0f1e1d0f3496351e478e92e

-----------------------------------------------------------------------

commit c4692baa007d86e4cab90b6cd88081133eb7438f
Merge: b48ace5 b31b393
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 22:59:05 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php  |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php  |   18 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php |    5 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php         |    3 -
 framework/Core/lib/Horde/Themes/Css.php                     |   98 ++++++-----
 framework/Core/package.xml                                  |    2 +
 nag/docs/CHANGES                                            |    1 +
 nag/lib/Task.php                                            |   12 +-
 nag/package.xml                                             |    2 +
 9 files changed, 83 insertions(+), 60 deletions(-)

http://git.horde.org/horde-git/-/commit/c4692baa007d86e4cab90b6cd88081133eb7438f

-----------------------------------------------------------------------

commit 36e7ff1905375765ee20a2e9a4833046b96da428
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 23:00:14 2013 -0700

    Obviously another botched merge

 imp/package.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/36e7ff1905375765ee20a2e9a4833046b96da428

-----------------------------------------------------------------------

commit 74a3d302cc980d5120de1f14849ebd0aa2905637
Merge: 36e7ff1 516e43f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 19 23:54:02 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Mime/Viewer/Html.php

 ansel/lib/Api.php                                                 |    3 -
 ansel/lib/View/List.php                                           |   20 ++--
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php |   16 ++++
 imp/lib/Mime/Viewer/Html.php                                      |    8 +-
 kronolith/lib/Event.php                                           |    2 +
 5 files changed, 32 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/74a3d302cc980d5120de1f14849ebd0aa2905637

-----------------------------------------------------------------------

commit 4c14c08e0a48b620b174f7d54d5aca2d8e639841
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 20 01:08:51 2013 -0700

    Only do if successful

 imp/js/dimpbase.js |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/4c14c08e0a48b620b174f7d54d5aca2d8e639841

-----------------------------------------------------------------------

commit 00c1f135ce998d29d53cc707351d53d203366bcf
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 20 01:09:10 2013 -0700

    Show flag/innocent icon immediately after reporting to indicate to user something happened

 imp/js/dimpbase.js          |    6 +++++-
 imp/lib/Dynamic/Mailbox.php |    2 ++
 2 files changed, 7 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/00c1f135ce998d29d53cc707351d53d203366bcf

-----------------------------------------------------------------------

commit d1e9b98e9da70d3c70cece5e304b5a069ad6c69e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 20 02:33:28 2013 -0700

    Missing static declaration

 imp/lib/IMP.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/d1e9b98e9da70d3c70cece5e304b5a069ad6c69e

-----------------------------------------------------------------------

commit 9e711b1659cbfd5b2477bbc5d1870bf33f6c4c28
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 23 17:54:27 2013 -0700

    Simplify check

 imp/lib/Imap.php |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/9e711b1659cbfd5b2477bbc5d1870bf33f6c4c28

-----------------------------------------------------------------------

commit fe51d09b9575d9b3a96ce5878beaf1a9d6c91b91
Merge: 9e711b1 311be7c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 23 18:02:43 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/LoginTasks/SystemTask/GarbageCollection.php
    	imp/package.xml

 .travis.yml                                                       |    2 +-
 ansel/docs/INSTALL                                                |    4 +-
 ansel/faces/custom.php                                            |   25 +
 ansel/js/slideshow.js                                             |   10 +-
 ansel/js/views/image.js                                           |    2 +-
 ansel/js/views/slideshow.js                                       |   11 +
 ansel/lib/Api.php                                                 |    3 +
 ansel/lib/Faces.php                                               |    2 +-
 ansel/lib/View/GalleryProperties.php                              |    1 +
 ansel/lib/View/GalleryRenderer/GalleryLightbox.php                |    7 +-
 ansel/lib/View/Image.php                                          |   35 +-
 ansel/lib/View/List.php                                           |  151 +++--
 ansel/lib/View/Slideshow.php                                      |   23 +-
 ansel/lib/Widget/ImageFaces.php                                   |   35 +-
 ansel/lib/Widget/Links.php                                        |   32 +-
 ansel/package.xml                                                 |   24 +-
 ansel/templates/faces/custom.inc                                  |   34 -
 ansel/templates/view/list.html.php                                |   60 ++
 ansel/templates/view/list.inc                                     |   64 --
 ansel/templates/view/slideshow.html.php                           |   39 +
 ansel/templates/view/slideshow.inc                                |   58 --
 ansel/templates/widgets/links.html.php                            |   21 +
 ansel/themes/default/graphics/embed.png                           |  Bin 0 -> 579 bytes
 ansel/themes/default/screen.css                                   |   51 +-
 ansel/view.php                                                    |    2 +-
 bundles/groupware/README                                          |   22 +-
 bundles/groupware/docs/INSTALL                                    |   11 +-
 bundles/webmail/README                                            |   22 +-
 bundles/webmail/docs/INSTALL                                      |   12 +-
 bundles/webmail/docs/PERFORMANCE                                  |    3 +
 chora/themes/default/ie7.css                                      |    4 -
 components/lib/Components/Component/Base.php                      |   19 +
 components/lib/Components/Component/Remote.php                    |   19 -
 components/lib/Components/Component/Source.php                    |   22 +
 components/lib/Components/Helper/Website.php                      |    1 +
 framework/ActiveSync/lib/Horde/ActiveSync/Timezone.php            |    1 +
 framework/ActiveSync/package.xml                                  |   21 +-
 framework/ActiveSync/test/Horde/ActiveSync/TimezoneTest.php       |    1 -
 framework/Auth/lib/Horde/Auth/Ldap.php                            |    4 +-
 framework/Core/lib/Horde/Themes/Css.php                           |    2 -
 framework/Core/package.xml                                        |   31 +-
 framework/Crypt/lib/Horde/Crypt/Pgp.php                           |   22 +-
 framework/Crypt/package.xml                                       |    6 +-
 framework/Db/doc/Horde/Db/README.TESTING.txt                      |   32 -
 framework/Db/doc/Horde/Db/README_TESTING                          |   32 +
 framework/Db/doc/Horde/Db/TODO                                    |   53 ++
 framework/Db/doc/Horde/Db/TODO.txt                                |   55 --
 framework/Db/package.xml                                          |   14 +-
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING             |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |   19 +-
 framework/Imap_Client/package.xml                                 |    2 +
 framework/Kolab_Storage/doc/Horde/Kolab/Storage/API.txt           |    6 +-
 framework/Pear/lib/Horde/Pear/Remote.php                          |    2 +-
 framework/Push/doc/Horde/Push/TODO                                |    1 +
 framework/Rdo/doc/Horde/Rdo/TODO                                  |  157 +++++
 framework/Rdo/doc/Horde/Rdo/TODO.txt                              |  154 ----
 framework/Rdo/package.xml                                         |   10 +-
 .../doc/Horde/Service/Facebook/examples/facebook_example.php      |  139 ++++
 .../doc/Horde/Service/Facebook/facebook_example.php               |  139 ----
 framework/Service_Facebook/package.xml                            |   12 +-
 .../doc/Horde/Service/Twitter/examples/twitter_browser.php        |   84 +++
 .../doc/Horde/Service/Twitter/examples/twitter_cli.php            |   36 +
 .../Service_Twitter/doc/Horde/Service/Twitter/twitter_browser.php |   84 ---
 .../Service_Twitter/doc/Horde/Service/Twitter/twitter_cli.php     |   36 -
 framework/Service_Twitter/package.xml                             |   16 +-
 framework/Service_Weather/doc/Horde/Service/Weather/UPGRADING     |    6 +-
 framework/SyncMl/doc/Horde/SyncMl/README.program_flow.txt         |   29 +-
 framework/SyncMl/doc/Horde/SyncMl/README.syncml_primer.txt        |   50 +-
 hermes/js/hermes.js                                               |   31 +-
 hermes/lib/Ajax.php                                               |    5 +-
 hermes/lib/Ajax/Application/Handler.php                           |   34 +-
 hermes/lib/Application.php                                        |    5 +-
 hermes/lib/Driver/Sql.php                                         |   18 +-
 hermes/lib/Form/Search.php                                        |   11 +-
 hermes/lib/Slice.php                                              |   10 +
 hermes/templates/dynamic/export.inc                               |    7 +-
 hermes/templates/dynamic/sidebar.html.php                         |    3 +
 hermes/templates/dynamic/slices.inc                               |   17 +-
 horde/docs/CODING_STANDARDS                                       |    6 +-
 horde/docs/INSTALL                                                |    4 +-
 horde/package.xml                                                 |    8 +-
 horde/themes/default/ie7.css                                      |    9 -
 horde/themes/default/ie8.css                                      |   24 +
 horde/themes/default/screen.css                                   |    2 +-
 imp/config/backends.php                                           |   12 +-
 imp/docs/INSTALL                                                  |    5 +-
 imp/lib/LoginTasks/SystemTask/GarbageCollection.php               |   13 +-
 imp/package.xml                                                   |    4 +-
 imp/themes/default/ie7.css                                        |   12 -
 kronolith/docs/CHANGES                                            |    2 +
 kronolith/package.xml                                             |   10 +-
 kronolith/themes/default/ie7.css                                  |   47 --
 passwd/README                                                     |    4 +-
 turba/package.xml                                                 |    8 +-
 turba/themes/default/ie7.css                                      |    9 -
 whups/docs/INSTALL                                                |    2 +-
 96 files changed, 1281 insertions(+), 1130 deletions(-)

http://git.horde.org/horde-git/-/commit/fe51d09b9575d9b3a96ce5878beaf1a9d6c91b91

-----------------------------------------------------------------------

commit 0d0b2c358e776809a6ceb5e8ae6fa104a4fa7dad
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 23 20:22:10 2013 -0700

    [mms] Add SMTP debugging.

 imp/config/backends.php  |   10 ++++++++--
 imp/docs/CHANGES         |    1 +
 imp/docs/UPGRADING       |    2 ++
 imp/lib/Factory/Mail.php |   36 +++++++++++++++++++++++++++++++++++-
 imp/package.xml          |    9 ++++++++-
 5 files changed, 54 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/0d0b2c358e776809a6ceb5e8ae6fa104a4fa7dad

-----------------------------------------------------------------------

commit 4a12b24f755cdcd3acb6010a27692fc593330a19
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 23 21:58:10 2013 -0700

    config docs

 imp/config/backends.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/4a12b24f755cdcd3acb6010a27692fc593330a19

-----------------------------------------------------------------------

commit a929a55a69445f998c93a10c9d54ad74fb59ae09
Merge: 4a12b24 601a6ad
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 23 22:53:19 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/Imap/Tree.php
    	imp/package.xml

 imp/docs/CHANGES      |    2 +
 imp/lib/Imap/Tree.php |   99 +++++++++++++++++++++++++-----------------------
 imp/package.xml       |    1 +
 3 files changed, 55 insertions(+), 47 deletions(-)

http://git.horde.org/horde-git/-/commit/a929a55a69445f998c93a10c9d54ad74fb59ae09

-----------------------------------------------------------------------

commit a06ffb5643c6618d650c3035e0c2096a842595da
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 24 00:19:49 2013 -0700

    Fix unit tests due to identity framework changes

 imp/test/Imp/Unit/Mime/Viewer/ItipTest.php |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/a06ffb5643c6618d650c3035e0c2096a842595da

-----------------------------------------------------------------------

commit d6b64567a2a42f722b042bd63024919f8f7c95ec
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 24 00:51:40 2013 -0700

    Convert shutdown methods to Horde_Queue tasks

 imp/lib/Factory/Compose.php     |    6 +++---
 imp/lib/Factory/Flags.php       |   26 ++++++++++++++------------
 imp/lib/Factory/Imap.php        |   29 +++++++++++++++++------------
 imp/lib/Factory/Imaptree.php    |   36 ++++++++++++++++++------------------
 imp/lib/Factory/Mailbox.php     |   16 ++++++++++------
 imp/lib/Factory/MailboxList.php |    8 ++++----
 imp/lib/Factory/Search.php      |   26 ++++++++++++++------------
 imp/package.xml                 |    7 +++++++
 8 files changed, 87 insertions(+), 67 deletions(-)

http://git.horde.org/horde-git/-/commit/d6b64567a2a42f722b042bd63024919f8f7c95ec

-----------------------------------------------------------------------

commit fb507e28f9a7aee3b87eccdbfa0ec96cea7f9533
Merge: d6b6456 4646277
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 24 17:34:28 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/Prefs/Special/Searches.php
    	imp/package.xml

 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |   10 +++++---
 framework/Imap_Client/package.xml                      |    2 +
 imp/docs/CHANGES                                       |    2 +
 imp/js/dimpbase.js                                     |   13 ++++++++---
 imp/js/searchesprefs.js                                |    3 --
 imp/lib/Prefs/Special/Searches.php                     |   18 +++------------
 imp/package.xml                                        |    2 +
 imp/templates/prefs/searches.html.php                  |    4 ---
 imp/themes/default/screen.css                          |    5 ----
 9 files changed, 25 insertions(+), 34 deletions(-)

http://git.horde.org/horde-git/-/commit/fb507e28f9a7aee3b87eccdbfa0ec96cea7f9533

-----------------------------------------------------------------------

commit f1a7a446d0b54c3558c9f226b1232ee26ba6da54
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 24 17:40:57 2013 -0700

    This needs to go into Horde_Core

 imp/package.xml |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/f1a7a446d0b54c3558c9f226b1232ee26ba6da54

-----------------------------------------------------------------------

commit 75852de8902d8f3b2ad0a19e67867849fa43b8d6
Merge: f1a7a44 52bbe0f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 24 22:15:17 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/search.php

 framework/Core/package.xml        |    7 +++++++
 framework/Imap_Client/package.xml |    4 ++--
 imp/lib/Basic/Search.php          |    4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/75852de8902d8f3b2ad0a19e67867849fa43b8d6

-----------------------------------------------------------------------

commit cc2cd47372a7e2184f834a7bd5a73decb199a260
Merge: 75852de 72a27f7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Feb 24 22:54:56 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Imap_Client/lib/Horde/Imap/Client/Ids.php      |   14 +++++-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php   |   17 +++++++-
 framework/Imap_Client/package.xml                        |   31 +++++++++-----
 framework/Imap_Client/test/Horde/Imap/Client/IdsTest.php |    9 ++++-
 4 files changed, 54 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/cc2cd47372a7e2184f834a7bd5a73decb199a260

-----------------------------------------------------------------------

commit 055300299ba5e25d4a663480aab97bd09c82dd02
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 11:47:22 2013 -0700

    Fix linking attachments when HTML is not used

 imp/lib/Compose.php |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/055300299ba5e25d4a663480aab97bd09c82dd02

-----------------------------------------------------------------------

commit 6f3969d903001ae8847f705f2f7b6cae49643164
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 15:06:06 2013 -0700

    Add debug/debug_raw example options to advanced imap config

 imp/config/backends.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/6f3969d903001ae8847f705f2f7b6cae49643164

-----------------------------------------------------------------------

commit f2fd2d84633db4ed511dd6c5a94cb7d16a6c83d8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 15:17:24 2013 -0700

    [mms] Move folder disabling configuration into backends.php.

 imp/config/backends.php |    8 ++++++++
 imp/config/conf.xml     |   13 +++----------
 imp/docs/CHANGES        |    1 +
 imp/docs/UPGRADING      |    4 ++++
 imp/lib/Imap.php        |   14 +++++++++++---
 imp/package.xml         |    1 +
 6 files changed, 28 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/f2fd2d84633db4ed511dd6c5a94cb7d16a6c83d8

-----------------------------------------------------------------------

commit 514f534d52d47b44daae09766434104897c46348
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 15:26:55 2013 -0700

    [mms] Move special mailboxes autocreation configuration into backends.php.

 imp/config/backends.php                |    6 +++++-
 imp/config/conf.xml                    |    4 ----
 imp/docs/CHANGES                       |    1 +
 imp/docs/UPGRADING                     |    8 ++++++--
 imp/lib/Imap.php                       |    5 +++++
 imp/lib/LoginTasks/Task/Autocreate.php |    2 +-
 imp/package.xml                        |    1 +
 7 files changed, 19 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/514f534d52d47b44daae09766434104897c46348

-----------------------------------------------------------------------

commit 7cdd4d9b86c450d474a8c0bc065e15e8b9894b20
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 15:39:02 2013 -0700

    [mms] Move fixed mailbox configuration into backends.php.

 imp/config/backends.php   |    4 ++++
 imp/config/conf.xml       |    3 ---
 imp/docs/CHANGES          |    1 +
 imp/docs/UPGRADING        |    4 ++++
 imp/js/folders.js         |   14 +++++---------
 imp/lib/Basic/Folders.php |    2 --
 imp/lib/Imap.php          |   20 ++++++++++++++++++--
 imp/lib/Mailbox.php       |    3 +--
 imp/package.xml           |    1 +
 9 files changed, 34 insertions(+), 18 deletions(-)

http://git.horde.org/horde-git/-/commit/7cdd4d9b86c450d474a8c0bc065e15e8b9894b20

-----------------------------------------------------------------------

commit 4f797229d26c50a15d273de79208d72cbe737122
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 15:41:23 2013 -0700

    Fixed for purposes of dynamic view also includes ACL restrictions

 imp/lib/Imap/Tree.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/4f797229d26c50a15d273de79208d72cbe737122

-----------------------------------------------------------------------

commit 120b6ca01eaae14d0d9bcb3f45593f3b2448fca8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 15:53:18 2013 -0700

    Imap_Client optimizes out empty arrays, so need to do explicit checks at runtime

 imp/lib/Imap.php |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/120b6ca01eaae14d0d9bcb3f45593f3b2448fca8

-----------------------------------------------------------------------

commit bfef895ba3cf0c4f7b76b1484fbe5b1df5a486bb
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 16:29:47 2013 -0700

    Don't permanently save the save_sent_mail value in the backend if logging into POP server

 imp/lib/Imap.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/bfef895ba3cf0c4f7b76b1484fbe5b1df5a486bb

-----------------------------------------------------------------------

commit 715ff38e2ec37b13b7746e8932388b8ba3c0db66
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 17:02:48 2013 -0700

    Add IMP_Mailbox constants linked to the name of the special mailbox prefs

 imp/lib/Ajax/Application/Handler/Common.php      |    6 +++---
 imp/lib/Ajax/Application/Handler/Smartmobile.php |    2 +-
 imp/lib/Application.php                          |    4 ++--
 imp/lib/Basic/Compose.php                        |   10 +++++-----
 imp/lib/Compose.php                              |    4 ++--
 imp/lib/Compose/Ui.php                           |    2 +-
 imp/lib/Dynamic/Compose/Common.php               |    8 ++++----
 imp/lib/Imap.php                                 |    8 +++++---
 imp/lib/LoginTasks/Task/PurgeSpam.php            |    5 +++--
 imp/lib/LoginTasks/Task/PurgeTrash.php           |    4 ++--
 imp/lib/Mailbox.php                              |   19 +++++++++++++------
 imp/lib/Message.php                              |    4 ++--
 imp/lib/Minimal/Compose.php                      |    6 +++---
 imp/lib/Prefs/Identity.php                       |    8 ++++----
 imp/lib/Prefs/Special/ComposeTemplates.php       |    8 ++++----
 imp/lib/Prefs/Special/Drafts.php                 |    4 ++--
 imp/lib/Prefs/Special/Sentmail.php               |    8 ++++----
 imp/lib/Prefs/Special/Spam.php                   |    4 ++--
 imp/lib/Prefs/Special/Trash.php                  |    4 ++--
 imp/lib/Spam.php                                 |    2 +-
 20 files changed, 65 insertions(+), 55 deletions(-)

http://git.horde.org/horde-git/-/commit/715ff38e2ec37b13b7746e8932388b8ba3c0db66

-----------------------------------------------------------------------

commit 06761a35f94bd0b9fc605c5cb2409875a3a5381e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 17:03:37 2013 -0700

    [mms] Allow default special mailbox names to be overriden by a backend.

 imp/config/backends.php |   29 ++++++++++++++++++++++++-----
 imp/config/prefs.php    |   24 ++++++++++--------------
 imp/docs/CHANGES        |    1 +
 imp/lib/Imap.php        |   16 +++++++++++++++-
 imp/package.xml         |    1 +
 5 files changed, 51 insertions(+), 20 deletions(-)

http://git.horde.org/horde-git/-/commit/06761a35f94bd0b9fc605c5cb2409875a3a5381e

-----------------------------------------------------------------------

commit b28d6514bbc6bb21a32ad76dd91c5bea1328c09d
Merge: 06761a3 bfef895
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 17:05:40 2013 -0700

    Merge branch 'master' into imp_6_1

 ansel/lib/Widget/ImageFaces.php                          |   84 +++-----------
 ansel/templates/widgets/imagefaces.html.php              |   24 ++++
 framework/Core/js/dialog.js                              |   29 +++--
 framework/Core/js/growler.js                             |   10 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php      |   10 ++-
 framework/Core/lib/Horde/Core/Factory/QueueStorage.php   |    5 +-
 framework/Core/lib/Horde/Core/Factory/ShutdownRunner.php |   14 +++
 framework/Core/lib/Horde/PageOutput.php                  |    7 +-
 framework/Core/lib/Horde/Registry.php                    |    1 +
 framework/Core/lib/Horde/Themes.php                      |   75 +++++++++---
 framework/Core/lib/Horde/Themes/Cache.php                |   32 ++++-
 framework/Core/lib/Horde/Themes/Element.php              |   36 ++++--
 framework/Core/package.xml                               |   24 +++--
 horde/js/activesyncadmin.js                              |    3 +-
 horde/js/activesyncprefs.js                              |    3 +-
 horde/js/categoryprefs.js                                |    2 +-
 horde/js/ieescguard.js                                   |   14 +-
 horde/js/login.js                                        |   49 +++------
 horde/js/logintasks.js                                   |   12 +--
 horde/js/slider2.js                                      |   40 ++++---
 horde/js/userupdate.js                                   |    7 +-
 horde/themes/default/screen.css                          |    3 -
 imp/lib/Imap.php                                         |    4 +-
 23 files changed, 268 insertions(+), 220 deletions(-)

http://git.horde.org/horde-git/-/commit/b28d6514bbc6bb21a32ad76dd91c5bea1328c09d

-----------------------------------------------------------------------

commit a4720185d672364d720971cf5098453706e07d0e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 17:15:16 2013 -0700

    Use Horde_ShutdownRunner

 imp/lib/Factory/Compose.php     |    2 +-
 imp/lib/Factory/Flags.php       |    2 +-
 imp/lib/Factory/Imap.php        |    2 +-
 imp/lib/Factory/Imaptree.php    |    2 +-
 imp/lib/Factory/Mailbox.php     |    2 +-
 imp/lib/Factory/MailboxList.php |    2 +-
 imp/lib/Factory/Search.php      |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/a4720185d672364d720971cf5098453706e07d0e

-----------------------------------------------------------------------

commit 94fc3cbf31673bd8795da0e326758c5501070255
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 25 23:28:52 2013 -0700

    Fix resolving UIDs for POP3 servers

 imp/lib/Mailbox/List/Pop3.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/94fc3cbf31673bd8795da0e326758c5501070255

-----------------------------------------------------------------------

commit 572091f01dd82d09856f868a00b440d6266fddec
Merge: 94fc3cb db994dd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 26 12:53:13 2013 -0700

    Merge branch 'master' into imp_6_1

 ansel/faces/custom.php                                     |    2 +-
 ansel/js/editfaces.js                                      |    4 +-
 ansel/lib/Ajax/Application/Handler.php                     |    7 +-
 ansel/lib/Ajax/Imple/EditFaces.php                         |   14 +-
 ansel/lib/Ansel.php                                        |    2 +-
 ansel/lib/Widget/Actions.php                               |    2 +-
 ansel/lib/Widget/GalleryFaces.php                          |    2 +-
 ansel/lib/Widget/Geotag.php                                |   64 +-
 ansel/templates/faces/image.inc                            |    2 +-
 ansel/templates/view/image.html.php                        |    4 +-
 ansel/templates/widgets/geotag.html.php                    |   14 +-
 ansel/templates/widgets/imagefaces.html.php                |   14 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php |    2 +-
 framework/Core/js/imple.js                                 |    6 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php        |    6 +-
 framework/Core/lib/Horde/Core/Ajax/Response/Raw.php        |    8 +-
 framework/Core/lib/Horde/Registry.php                      |   33 +-
 framework/Core/package.xml                                 |    2 +
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Sync.php  |   10 +-
 framework/Imap_Client/package.xml                          |    4 +-
 framework/Tree/doc/Horde/Tree/COPYING                      |  599 ++++++++----
 framework/Tree/package.xml                                 |   34 +-
 horde/docs/CODING_STANDARDS                                |    2 +-
 horde/docs/INSTALL                                         |   20 +
 imp/lib/Compose/References.php                             |    8 +-
 ingo/spam.php                                              |    2 +-
 ingo/vacation.php                                          |    2 +-
 27 files changed, 539 insertions(+), 330 deletions(-)

http://git.horde.org/horde-git/-/commit/572091f01dd82d09856f868a00b440d6266fddec

-----------------------------------------------------------------------

commit 0ec4a8b1c987dbbfe659265f64d7e5eeebbe551e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 26 13:17:24 2013 -0700

    Better way to clear the search form

 imp/js/smartmobile.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/0ec4a8b1c987dbbfe659265f64d7e5eeebbe551e

-----------------------------------------------------------------------

commit 3239904456293247798fbcb19c14187d99bc31cf
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 26 13:31:28 2013 -0700

    simplify

 imp/js/smartmobile.js |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

http://git.horde.org/horde-git/-/commit/3239904456293247798fbcb19c14187d99bc31cf

-----------------------------------------------------------------------

commit d4df69be8a5e3a1703c608c692e61dad733b33b2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 26 14:01:23 2013 -0700

    Unnecessary

 imp/templates/smartmobile/search.html.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/d4df69be8a5e3a1703c608c692e61dad733b33b2

-----------------------------------------------------------------------

commit 7e8ba941fe4c63e4132b0bd43e6561d952247ef8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 26 14:20:01 2013 -0700

    Placeholder to allow for easy debugging of jqm

 imp/lib/Smartmobile.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/7e8ba941fe4c63e4132b0bd43e6561d952247ef8

-----------------------------------------------------------------------

commit 0a267bae81257ad02c0754ccd1d74836fb8fcd84
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 26 13:52:16 2013 -0700

    [mms] Add link to exit out of search view in smartmobile view into the original mailbox.

 imp/docs/CHANGES        |    2 ++
 imp/js/smartmobile.js   |   44 ++++++++++++++++++++++++++++++++++++--------
 imp/lib/Smartmobile.php |    2 ++
 imp/package.xml         |    1 +
 4 files changed, 41 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/0a267bae81257ad02c0754ccd1d74836fb8fcd84

-----------------------------------------------------------------------

commit 1c4f9536b1b3e2c1f88b3488a3e0004975a38a92
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 26 22:32:53 2013 -0700

    [mms] Allow the active search query to be edited in the smartmobile view.

 imp/docs/CHANGES                           |    1 +
 imp/js/smartmobile.js                      |   17 ++++++++++++-----
 imp/package.xml                            |    1 +
 imp/templates/smartmobile/mailbox.html.php |    3 ++-
 4 files changed, 16 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/1c4f9536b1b3e2c1f88b3488a3e0004975a38a92

-----------------------------------------------------------------------

commit 34b4855fbfde6d5ae0eb6df2e24239b1dfa45331
Merge: 1c4f953 4aa91f9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 27 01:16:02 2013 -0700

    Merge branch 'master' into imp_6_1

 .../ActiveSync/lib/Horde/ActiveSync/Request/MeetingResponse.php   |   30 +-
 framework/Core/lib/Horde/Core/Factory/QueueStorage.php            |    5 +-
 framework/Core/lib/Horde/Core/Factory/ShutdownRunner.php          |   14 -
 framework/Core/lib/Horde/Registry.php                             |    1 -
 framework/Core/lib/Horde/Shutdown.php                             |   73 +++++
 framework/Core/lib/Horde/Shutdown/Task.php                        |   31 ++
 framework/Core/package.xml                                        |   28 +-
 7 files changed, 134 insertions(+), 48 deletions(-)

http://git.horde.org/horde-git/-/commit/34b4855fbfde6d5ae0eb6df2e24239b1dfa45331

-----------------------------------------------------------------------

commit 775dadce07cbbebdbcbe3e2784dc3e66f34aef9c
Merge: 34b4855 62a33f7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 27 00:58:54 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Core/lib/Horde/Shutdown.php |    8 ++++----
 framework/Core/package.xml            |   14 +++++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/775dadce07cbbebdbcbe3e2784dc3e66f34aef9c

-----------------------------------------------------------------------

commit 6bc7bb5fae9a8af9b8ffc1038c3123623206fa96
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 27 01:21:44 2013 -0700

    Convert to Horde_Shutdown

 imp/lib/Factory/Compose.php     |    6 +++---
 imp/lib/Factory/Flags.php       |    6 +++---
 imp/lib/Factory/Imap.php        |    6 +++---
 imp/lib/Factory/Imaptree.php    |    6 +++---
 imp/lib/Factory/Mailbox.php     |    6 +++---
 imp/lib/Factory/MailboxList.php |    6 +++---
 imp/lib/Factory/Search.php      |    6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/6bc7bb5fae9a8af9b8ffc1038c3123623206fa96

-----------------------------------------------------------------------

commit c9e12bc01777cbaaa842fd33e759d0d9c0dc102f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 27 01:12:31 2013 -0700

    [mms] Upgraded IMP permissions to allow permissions to be set per active backend.

 imp/bin/imp-admin-upgrade |   88 +++++++++++++++++++++++++++++
 imp/config/backends.php   |    8 ---
 imp/docs/CHANGES          |    4 +-
 imp/docs/UPGRADING        |   18 +++++-
 imp/lib/Application.php   |   25 +--------
 imp/lib/Basic/Base.php    |    5 ++
 imp/lib/Basic/Folders.php |    2 +-
 imp/lib/Compose.php       |   10 ++--
 imp/lib/IMP.php           |   52 -----------------
 imp/lib/Imap.php          |   91 ++++++++++++++++++++++++------
 imp/lib/Mailbox.php       |   14 +++--
 imp/lib/Perms.php         |  135 +++++++++++++++++++++++++++++++++++++++++++++
 imp/lib/Tree/Flist.php    |   10 ++-
 imp/package.xml           |   15 ++++-
 14 files changed, 353 insertions(+), 124 deletions(-)
 create mode 100755 imp/bin/imp-admin-upgrade
 create mode 100644 imp/lib/Perms.php

http://git.horde.org/horde-git/-/commit/c9e12bc01777cbaaa842fd33e759d0d9c0dc102f

-----------------------------------------------------------------------

commit a98773b909d0be7a4b7ec5768db8530db11eaaba
Merge: c9e12bc 367e93d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 28 19:58:47 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Http/lib/Horde/Http/Request/Fopen.php |    1 +
 framework/Http/package.xml                      |    4 ++--
 hermes/lib/Hermes.php                           |    6 +-----
 imp/lib/Imap/Tree.php                           |    3 ++-
 kronolith/docs/CHANGES                          |    2 ++
 kronolith/lib/Application.php                   |    2 +-
 kronolith/package.xml                           |    2 ++
 nag/docs/CHANGES                                |    2 ++
 nag/lib/Api.php                                 |   14 ++++++++++++--
 nag/package.xml                                 |    4 ++++
 10 files changed, 29 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/a98773b909d0be7a4b7ec5768db8530db11eaaba

-----------------------------------------------------------------------

commit ba86663fac41ef14c0ca499e536304c62c59764b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 14:16:31 2013 -0700

    phpdoc

 imp/lib/Imap.php |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/ba86663fac41ef14c0ca499e536304c62c59764b

-----------------------------------------------------------------------

commit 40fb9e6321b33583560c582d630ded325725ac45
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 14:16:50 2013 -0700

    Leave compose recipient restriction permissions as global, not per backend

 imp/bin/imp-admin-upgrade |    4 +---
 imp/lib/Imap.php          |   11 ++++++++---
 imp/lib/Perms.php         |   16 +++++++++++++---
 3 files changed, 22 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/40fb9e6321b33583560c582d630ded325725ac45

-----------------------------------------------------------------------

commit d4559cffb707111657429f57e2a8089760f7b4c8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 14:37:21 2013 -0700

    phpdoc

 imp/docs/UPGRADING |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/d4559cffb707111657429f57e2a8089760f7b4c8

-----------------------------------------------------------------------

commit 636b86d7c75011c8d62180a5b4a0959bbd8cbac8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 14:38:57 2013 -0700

    Remove the mbox_special hook - this can be configured in backends.php now

 imp/config/backends.php   |   10 +++++++++-
 imp/config/hooks.php.dist |   15 ---------------
 imp/docs/UPGRADING        |    3 +++
 imp/lib/Imap.php          |   23 ++++++++++++++++++++---
 imp/lib/Mailbox.php       |   22 +++++++++++-----------
 5 files changed, 43 insertions(+), 30 deletions(-)

http://git.horde.org/horde-git/-/commit/636b86d7c75011c8d62180a5b4a0959bbd8cbac8

-----------------------------------------------------------------------

commit c39e416a964c5e5442c0b8f8c26fe18baae2b086
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 18:42:18 2013 -0700

    tweaks

 imp/lib/Imap.php |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/c39e416a964c5e5442c0b8f8c26fe18baae2b086

-----------------------------------------------------------------------

commit 9f57ff78189a6417e1fbf3d914df2371173f130f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 19:08:37 2013 -0700

    phpdoc

 framework/Imap_Client/lib/Horde/Imap/Client/Data/Acl.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/9f57ff78189a6417e1fbf3d914df2371173f130f

-----------------------------------------------------------------------

commit 064d906746a05562db7f34a56d0a7f97bac0a1b8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 19:27:28 2013 -0700

    Abstract ACL class to work even if the underlying server does not natively support ACL

 imp/config/prefs.php        |    7 +---
 imp/lib/Auth.php            |    5 ---
 imp/lib/Dynamic/Mailbox.php |    9 +----
 imp/lib/Imap.php            |    6 +++
 imp/lib/Imap/Acl.php        |   82 +++++++++++++++++++++++--------------------
 imp/lib/Mailbox.php         |   10 ++---
 6 files changed, 57 insertions(+), 62 deletions(-)

http://git.horde.org/horde-git/-/commit/064d906746a05562db7f34a56d0a7f97bac0a1b8

-----------------------------------------------------------------------

commit 7a0f485a63cc9d08f5b3ad667bbdf1877ecfd338
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 19:37:49 2013 -0700

    ws

 imp/config/hooks.php.dist |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/7a0f485a63cc9d08f5b3ad667bbdf1877ecfd338

-----------------------------------------------------------------------

commit 4bce7e430745e1cd929f897e21b5dd5c6cc2381e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 20:34:09 2013 -0700

    [mms] Add the 'mbox_acl' hook.

 imp/config/backends.php                           |    4 -
 imp/config/hooks.php.dist                         |   55 ++++++++++++-----
 imp/docs/CHANGES                                  |    2 +-
 imp/docs/UPGRADING                                |   17 ++++--
 imp/lib/Imap.php                                  |   15 -----
 imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php |    2 +-
 imp/lib/Mailbox.php                               |   70 +++++++-------------
 imp/package.xml                                   |    2 +-
 8 files changed, 80 insertions(+), 87 deletions(-)

http://git.horde.org/horde-git/-/commit/4bce7e430745e1cd929f897e21b5dd5c6cc2381e

-----------------------------------------------------------------------

commit 7686c2f022e443e849e3090939540ca8690efbdf
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 20:42:29 2013 -0700

    More compact variable name

 imp/lib/Imap.php |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

http://git.horde.org/horde-git/-/commit/7686c2f022e443e849e3090939540ca8690efbdf

-----------------------------------------------------------------------

commit 884b2cd55dd2d2be1e74c9b7d1ac0ec048d91c34
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 1 22:49:34 2013 -0700

    Move more IMAP session setup code into IMP_Imap
    
    No need to parse the config file again.
    Don't store admin password in memory.  It's rarely used.

 imp/lib/Application.php       |   21 ++++-----
 imp/lib/Auth.php              |   66 +---------------------------
 imp/lib/Dynamic/Mailbox.php   |    2 +-
 imp/lib/Factory/AuthImap.php  |   27 +++++------
 imp/lib/Factory/Mail.php      |   23 +++------
 imp/lib/Factory/Quota.php     |   13 +-----
 imp/lib/Imap.php              |   96 ++++++++++++++++++++++++++++++++++++++++-
 imp/lib/Mailbox/List.php      |    6 ++-
 imp/lib/Prefs/Special/Acl.php |    4 +-
 imp/lib/Quota/Ui.php          |    2 +-
 10 files changed, 136 insertions(+), 124 deletions(-)

http://git.horde.org/horde-git/-/commit/884b2cd55dd2d2be1e74c9b7d1ac0ec048d91c34

-----------------------------------------------------------------------

commit 66eb74db99fac1dc36de3a099c8aaf65ecf2bba9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 2 00:35:37 2013 -0700

    Remove mimp_advanced hook

 imp/config/hooks.php.dist              |   37 --------------------------------
 imp/docs/UPGRADING                     |    9 +++++--
 imp/lib/Minimal/Compose.php            |   20 +++++++----------
 imp/lib/Minimal/Mailbox.php            |   11 ++-------
 imp/templates/minimal/mailbox.html.php |    6 -----
 5 files changed, 17 insertions(+), 66 deletions(-)

http://git.horde.org/horde-git/-/commit/66eb74db99fac1dc36de3a099c8aaf65ecf2bba9

-----------------------------------------------------------------------

commit 92aa4c1874ffc2b16f92e566dd5136889ee67287
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 2 15:52:18 2013 -0700

    phpdoc

 imp/config/backends.php |  296 ++++++++++++++++++++++++-----------------------
 1 files changed, 150 insertions(+), 146 deletions(-)

http://git.horde.org/horde-git/-/commit/92aa4c1874ffc2b16f92e566dd5136889ee67287

-----------------------------------------------------------------------

commit 2f80dbe22d2714ab48a71953be33aa54aba5f7cf
Merge: 92aa4c1 f51d332
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 2 17:15:07 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php |   18 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php        |    3 +
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |   12 +-
 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php           |   51 +-
 framework/ActiveSync/package.xml                                  |   27 +-
 framework/Lock/lib/Horde/Lock/Sql.php                             |   33 +-
 framework/Lock/package.xml                                        |   32 +-
 framework/Lock/test/Horde/Lock/AllTests.php                       |    3 +
 framework/Lock/test/Horde/Lock/LockTest.php                       |  218 +++++
 framework/Lock/test/Horde/Lock/bootstrap.php                      |    3 +
 framework/Lock/test/Horde/Lock/phpunit.xml                        |    1 +
 imp/lib/Ajax/Application/Handler/Smartmobile.php                  |    2 +-
 imp/lib/Test.php                                                  |   10 +-
 ingo/lib/Test.php                                                 |    2 +-
 14 files changed, 357 insertions(+), 58 deletions(-)

http://git.horde.org/horde-git/-/commit/2f80dbe22d2714ab48a71953be33aa54aba5f7cf

-----------------------------------------------------------------------

commit dc95a98c69e7b5c9bcf56094cd0df9babd1231e7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 3 12:28:32 2013 -0700

    Take idea from k-9 mail: scroll down to top of message content when first loading message

 imp/js/smartmobile.js |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/dc95a98c69e7b5c9bcf56094cd0df9babd1231e7

-----------------------------------------------------------------------

commit 76f040ce51d2a61a89d2ea43b27f9dffb906775a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 3 12:36:16 2013 -0700

    Not needed

 imp/js/dimpbase.js          |    8 --------
 imp/lib/Dynamic/Mailbox.php |    1 -
 2 files changed, 0 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/76f040ce51d2a61a89d2ea43b27f9dffb906775a

-----------------------------------------------------------------------

commit 4992ac91aabc8b0726c4ec25d37809ca193932fe
Merge: 76f040c deed1fa
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 3 13:13:51 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/js/dimpbase.js
    	imp/lib/Search.php
    	imp/package.xml

 imp/docs/CHANGES      |    4 +++-
 imp/js/dimpbase.js    |    8 +++++---
 imp/lib/Imap/Tree.php |   19 +++++++++++--------
 imp/lib/Search.php    |   24 +++++++++++++++++++++++-
 imp/package.xml       |    3 ++-
 5 files changed, 44 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/4992ac91aabc8b0726c4ec25d37809ca193932fe

-----------------------------------------------------------------------

commit 008b1ab5af68167e89b0733b8b5fd0c93fb05c4e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 3 17:22:22 2013 -0700

    Use Horde_Compress_Fast to detrmine compressed size instead of directly calling lzf

 imp/bin/imp-query-imap-cache |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/008b1ab5af68167e89b0733b8b5fd0c93fb05c4e

-----------------------------------------------------------------------

commit 8bbace42fcd83c0a8144da4457f970d1ea505974
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 3 17:48:12 2013 -0700

    doc tweak

 imp/config/prefs.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8bbace42fcd83c0a8144da4457f970d1ea505974

-----------------------------------------------------------------------

commit e45e3c9e8da76428f5983cdebddb4bb9ccbcbeb7
Merge: 8bbace4 a380308
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 4 01:30:45 2013 -0700

    Merge branch 'master' into imp_6_1

 chora/lib/Application.php                                         |   24 +-
 chora/lib/Chora.php                                               |    2 +-
 components/lib/Components/Component/Source.php                    |   13 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |    8 +-
 framework/ActiveSync/package.xml                                  |   22 +-
 framework/Cache/lib/Horde/Cache.php                               |   21 +-
 framework/Cache/package.xml                                       |   17 +-
 framework/Compress_Fast/doc/Horde/Compress/Fast/COPYING           |  458 +++
 framework/Compress_Fast/lib/Horde/Compress/Fast.php               |  113 +
 framework/Compress_Fast/lib/Horde/Compress/Fast/Base.php          |   55 +
 framework/Compress_Fast/lib/Horde/Compress/Fast/Exception.php     |   25 +
 framework/Compress_Fast/lib/Horde/Compress/Fast/Lz4.php           |   50 +
 framework/Compress_Fast/lib/Horde/Compress/Fast/Lzf.php           |   50 +
 framework/Compress_Fast/lib/Horde/Compress/Fast/Null.php          |   39 +
 framework/Compress_Fast/package.xml                               |  147 +
 framework/Compress_Fast/test/Horde/Compress/Fast/AllTests.php     |    3 +
 .../Compress_Fast/test/Horde/Compress/Fast/CompressFastTest.php   |  180 +
 framework/Compress_Fast/test/Horde/Compress/Fast/bootstrap.php    |    3 +
 framework/Compress_Fast/test/Horde/Compress/Fast/phpunit.xml      |    1 +
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |    2 +-
 framework/Core/lib/Horde/Core/Factory/Cache.php                   |    2 +-
 framework/Core/lib/Horde/Session.php                              |   33 +-
 framework/Core/package.xml                                        |   42 +-
 framework/lz4/CREDITS                                             |   11 +
 framework/lz4/LICENSE                                             |   68 +
 framework/lz4/LICENSE.lz4                                         |   30 +
 framework/lz4/README.md                                           |   64 +
 framework/lz4/config.m4                                           |   37 +
 framework/lz4/horde_lz4.c                                         |  154 +
 framework/lz4/horde_lz4.h                                         |   28 +
 framework/lz4/lz4.c                                               |  906 +++++
 framework/lz4/lz4.h                                               |  128 +
 framework/lz4/lz4hc.c                                             |  730 ++++
 framework/lz4/lz4hc.h                                             |   60 +
 framework/lz4/package.xml                                         |  107 +
 framework/lz4/php_verdep.h                                        |   65 +
 framework/lz4/tests/001.phpt                                      |   26 +
 framework/lz4/tests/002.phpt                                      |   38 +
 framework/lz4/tests/003.phpt                                      |   19 +
 framework/lz4/tests/004.phpt                                      |   19 +
 framework/lz4/tests/005.phpt                                      |   43 +
 framework/lz4/tests/006.phpt                                      |   26 +
 framework/lz4/tests/007.phpt                                      |   20 +
 framework/lz4/tests/data.inc                                      |   87 +
 horde/config/conf.xml                                             |    4 +-
 horde/docs/INSTALL                                                |    4 +-
 horde/lib/Test.php                                                |    5 +-
 horde/themes/default/ie8.css                                      |    1 +
 48 files changed, 3910 insertions(+), 80 deletions(-)

http://git.horde.org/horde-git/-/commit/e45e3c9e8da76428f5983cdebddb4bb9ccbcbeb7

-----------------------------------------------------------------------

commit 5c3925f686d140a13d6e830bf91620d874b7f4bf
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 4 01:37:15 2013 -0700

    phpdoc

 imp/config/hooks.php.dist |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/5c3925f686d140a13d6e830bf91620d874b7f4bf

-----------------------------------------------------------------------

commit dd4e239771cd73036b0e94429da0c0fd5688f8ef
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 4 02:06:21 2013 -0700

    Simplify backend examples
    
    Remove duplicative 'secure-imap' config.
    
    Default POP3 servers to TLS logins to match IMAP.

 imp/config/backends.php |   46 +---------------------------------------------
 1 files changed, 1 insertions(+), 45 deletions(-)

http://git.horde.org/horde-git/-/commit/dd4e239771cd73036b0e94429da0c0fd5688f8ef

-----------------------------------------------------------------------

commit cfdcbd1fbb237ae6b5b6695f67c022ffbb412c5f
Merge: dd4e239 b94c1f5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 4 14:08:18 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/Core/package.xml                   |   35 +++++++++++++++++--------
 framework/Url/lib/Horde/Url/Data.php         |   22 ++++++++++++++-
 framework/Url/package.xml                    |   12 ++++----
 framework/Url/test/Horde/Url/UrlDataTest.php |   11 ++++++++
 horde/docs/CHANGES                           |    1 +
 horde/lib/View/Topbar.php                    |    5 +++
 horde/package.xml                            |    4 +-
 horde/templates/topbar/_menubar.html.php     |    3 ++
 kronolith/docs/CHANGES                       |    2 +
 kronolith/js/kronolith.js                    |   13 +++++++--
 kronolith/package.xml                        |    2 +
 wicked/lib/Text_Wiki/Render/Xhtml/Image2.php |   10 +++++--
 12 files changed, 93 insertions(+), 27 deletions(-)

http://git.horde.org/horde-git/-/commit/cfdcbd1fbb237ae6b5b6695f67c022ffbb412c5f

-----------------------------------------------------------------------

commit 4cdc843fbd14f9fa1ffffe77719c2066bbb7ffa5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 4 14:09:24 2013 -0700

    [mms] Support showing blocked Data URIs in HTML message data.

 imp/docs/CHANGES             |    1 +
 imp/lib/Mime/Viewer/Html.php |    8 ++++++--
 imp/package.xml              |    3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/4cdc843fbd14f9fa1ffffe77719c2066bbb7ffa5

-----------------------------------------------------------------------

commit 60e6c327192a74f352cde91555ef7e13cb7ee11d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 4 17:59:26 2013 -0700

    Fix incorrect argument warnings

 imp/lib/Imap.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/60e6c327192a74f352cde91555ef7e13cb7ee11d

-----------------------------------------------------------------------

commit ec0f1ce8bfcbb27a73b995d5171111f3bf519cdb
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 4 02:07:26 2013 -0700

    [mms] Spam reporting configuration has been moved to the backends file.

 imp/config/backends.php                     |   46 +++++
 imp/config/conf.xml                         |   64 -------
 imp/config/hooks.php.dist                   |   17 --
 imp/docs/CHANGES                            |    1 +
 imp/docs/UPGRADING                          |   17 ++
 imp/lib/Ajax/Application/Handler/Common.php |    4 +-
 imp/lib/Basic/Mailbox.php                   |    4 +-
 imp/lib/Basic/Message.php                   |    8 +-
 imp/lib/Imap.php                            |   23 +++
 imp/lib/Minimal/Mailbox.php                 |    2 +-
 imp/lib/Minimal/Message.php                 |    2 +-
 imp/lib/Spam.php                            |  246 +++++++++++++++------------
 imp/package.xml                             |    1 +
 13 files changed, 240 insertions(+), 195 deletions(-)

http://git.horde.org/horde-git/-/commit/ec0f1ce8bfcbb27a73b995d5171111f3bf519cdb

-----------------------------------------------------------------------

commit e34c59bdf8f32f200e84dc8e99168b27498775e8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 4 18:48:11 2013 -0700

    A bit more moving around in the backends.php file

 imp/config/backends.php |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/e34c59bdf8f32f200e84dc8e99168b27498775e8

-----------------------------------------------------------------------

commit a769f77d8d26b476ea4a759604b4d5d3d21294dc
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 4 20:44:27 2013 -0700

    Forgot to remove spamfolder config remnants

 imp/lib/Ajax/Application/ListMessages.php |    4 ++--
 imp/lib/Basic/Mailbox.php                 |    8 +++-----
 imp/lib/Basic/Message.php                 |    6 ++----
 imp/lib/Dynamic/Mailbox.php               |   10 +++++-----
 imp/lib/Dynamic/Message.php               |    5 ++---
 imp/lib/Mailbox.php                       |   11 +++++++++++
 imp/lib/Minimal/Message.php               |    8 +++-----
 imp/lib/Smartmobile.php                   |    6 +++---
 8 files changed, 31 insertions(+), 27 deletions(-)

http://git.horde.org/horde-git/-/commit/a769f77d8d26b476ea4a759604b4d5d3d21294dc

-----------------------------------------------------------------------

commit da0c400fb083989119d90d684ef0c01f697bc276
Merge: a769f77 6ad71ec
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 4 20:59:28 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/ActiveSync/test/Horde/ActiveSync/AppointmentTest.php |    8 ++++++++
 framework/Vfs/test/Horde/Vfs/FileTest.php                      |    3 +++
 2 files changed, 11 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/da0c400fb083989119d90d684ef0c01f697bc276

-----------------------------------------------------------------------

commit 3828266c110d3069940022566f6c93c4d39fe841
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 5 11:11:27 2013 -0700

    Standardize on 'innocent', not 'notspam'

 imp/js/mailbox.js                                   |    8 ++++----
 imp/js/message.js                                   |    8 ++++----
 imp/lib/Basic/Mailbox.php                           |    8 ++++----
 imp/lib/Basic/Message.php                           |    8 ++++----
 imp/lib/Dynamic/Mailbox.php                         |    2 +-
 imp/templates/basic/mailbox/actions.html.php        |    4 ++--
 imp/templates/basic/message/navbar_actions.html.php |    4 ++--
 imp/templates/dynamic/mailbox.html.php              |    2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)

http://git.horde.org/horde-git/-/commit/3828266c110d3069940022566f6c93c4d39fe841

-----------------------------------------------------------------------

commit 0fdff7fe9b5bacc47175f1d8f27a20832d04e342
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 5 11:22:57 2013 -0700

    Fix setting spam parameters in the session

 imp/lib/Dynamic/Mailbox.php |    8 ++++----
 imp/lib/Imap.php            |    4 ++--
 imp/lib/Smartmobile.php     |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/0fdff7fe9b5bacc47175f1d8f27a20832d04e342

-----------------------------------------------------------------------

commit 79eafab0e1095540d30423326e72bb9caa86fec3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 5 11:27:00 2013 -0700

    Need to check for existence of false for innocent display

 imp/lib/Mailbox.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/79eafab0e1095540d30423326e72bb9caa86fec3

-----------------------------------------------------------------------

commit eb696347634837fadae60555fce7f8a9600664e4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 5 11:31:24 2013 -0700

    Don't shell escape e-mail replacements

 imp/lib/Spam.php |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/eb696347634837fadae60555fce7f8a9600664e4

-----------------------------------------------------------------------

commit 24dfbb3c793e63a2695fd84c94051a6e7966b69b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 5 20:42:17 2013 -0700

    [mms] Move backend configuration parsing/retrieval to IMP_Imap_Config.

 imp/bin/imp-admin-upgrade              |    6 +-
 imp/bin/imp-query-imap-cache           |    2 +-
 imp/config/backends.php                |    2 +-
 imp/docs/CHANGES                       |    1 +
 imp/lib/Application.php                |    7 +-
 imp/lib/Auth.php                       |   58 ++-----
 imp/lib/Compose.php                    |   11 +-
 imp/lib/Dynamic/Mailbox.php            |   10 +-
 imp/lib/Factory/AuthImap.php           |    2 +-
 imp/lib/Factory/Mail.php               |    2 +-
 imp/lib/Factory/Quota.php              |    2 +-
 imp/lib/IMP.php                        |    4 +-
 imp/lib/Imap.php                       |  270 ++++++-----------------------
 imp/lib/Imap/Config.php                |  293 ++++++++++++++++++++++++++++++++
 imp/lib/LoginTasks/Task/Autocreate.php |    2 +-
 imp/lib/Mailbox.php                    |    6 +-
 imp/lib/Perms.php                      |    4 +-
 imp/lib/Prefs/Identity.php             |    2 +-
 imp/lib/Prefs/Special/Acl.php          |    2 +-
 imp/lib/Quota/Mdaemon.php              |    2 +-
 imp/lib/Quota/Ui.php                   |    2 +-
 imp/lib/Smartmobile.php                |    4 +-
 imp/lib/Spam.php                       |    4 +-
 imp/package.xml                        |    7 +-
 24 files changed, 412 insertions(+), 293 deletions(-)
 create mode 100644 imp/lib/Imap/Config.php

http://git.horde.org/horde-git/-/commit/24dfbb3c793e63a2695fd84c94051a6e7966b69b

-----------------------------------------------------------------------

commit 322c8067305f8397ab0f857371e055a3b5a80414
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 5 20:18:18 2013 -0700

    These variables should be stored in IMAP object

 imp/lib/Imap.php |   41 ++++++++++++++---------------------------
 1 files changed, 14 insertions(+), 27 deletions(-)

http://git.horde.org/horde-git/-/commit/322c8067305f8397ab0f857371e055a3b5a80414

-----------------------------------------------------------------------

commit 35ca36ae0ea4dd505aa935a6843946606236fbcc
Merge: 322c806 6633e39
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 00:44:52 2013 -0700

    Merge branch 'master' into imp_6_1

 agora/locale/de/LC_MESSAGES/agora.mo                              |  Bin 81281 -> 80886 bytes
 ansel/locale/ansel.pot                                            |  385 ++---
 ansel/locale/de/LC_MESSAGES/ansel.mo                              |  Bin 106504 -> 105788 bytes
 ansel/locale/de/LC_MESSAGES/ansel.po                              |  389 ++---
 chora/locale/chora.pot                                            |   16 +-
 chora/locale/de/LC_MESSAGES/chora.mo                              |  Bin 71421 -> 71050 bytes
 chora/locale/de/LC_MESSAGES/chora.po                              |   16 +-
 framework/ActiveSync/test/Horde/ActiveSync/AppointmentTest.php    |    6 -
 .../ActiveSync/test/Horde/ActiveSync/fixtures/appointment.wbxml   |  Bin 371 -> 376 bytes
 .../ActiveSync/test/Horde/ActiveSync/fixtures/recurrence.wbxml    |  Bin 389 -> 394 bytes
 .../test/Horde/ActiveSync/fixtures/simpleexception.wbxml          |  Bin 423 -> 428 bytes
 framework/Alarm/package.xml                                       |   21 +-
 framework/Argv/locale/Horde_Argv.pot                              |   16 +-
 framework/Argv/locale/de/LC_MESSAGES/Horde_Argv.mo                |  Bin 1492 -> 1492 bytes
 framework/Argv/locale/de/LC_MESSAGES/Horde_Argv.po                |   16 +-
 framework/Argv/package.xml                                        |   25 +-
 framework/Auth/locale/Horde_Auth.pot                              |   30 +-
 framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.mo                |  Bin 3104 -> 3104 bytes
 framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.po                |   30 +-
 framework/Auth/package.xml                                        |   21 +-
 framework/Autoloader_Cache/package.xml                            |   21 +-
 framework/Cache/lib/Horde/Cache.php                               |    6 +-
 framework/Cache/package.xml                                       |   36 +-
 framework/Cli_Modular/package.xml                                 |   21 +-
 framework/Compress_Fast/lib/Horde/Compress/Fast/Lz4.php           |    2 +-
 framework/Compress_Fast/lib/Horde/Compress/Fast/Lzf.php           |    2 +-
 framework/Compress_Fast/package.xml                               |   22 +-
 framework/Core/lib/Horde/Session/Null.php                         |    1 +
 framework/Core/locale/Horde_Core.pot                              |   63 +-
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.mo                |  Bin 19930 -> 20186 bytes
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.po                |   73 +-
 framework/Crypt/locale/Horde_Crypt.pot                            |   74 +-
 framework/Crypt/locale/de/LC_MESSAGES/Horde_Crypt.mo              |  Bin 7765 -> 7765 bytes
 framework/Crypt/locale/de/LC_MESSAGES/Horde_Crypt.po              |   74 +-
 framework/Crypt/package.xml                                       |   24 +-
 framework/Date/locale/Horde_Date.pot                              |   12 +-
 framework/Date/locale/de/LC_MESSAGES/Horde_Date.mo                |  Bin 1126 -> 1126 bytes
 framework/Date/locale/de/LC_MESSAGES/Horde_Date.po                |   12 +-
 framework/Date/package.xml                                        |   23 +-
 framework/Date_Parser/package.xml                                 |   21 +-
 framework/Db/package.xml                                          |   21 +-
 framework/ElasticSearch/package.xml                               |   23 +-
 framework/Group/package.xml                                       |   21 +-
 framework/History/package.xml                                     |   21 +-
 framework/Http/package.xml                                        |   23 +-
 framework/Icalendar/package.xml                                   |   21 +-
 framework/Image/package.xml                                       |   21 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |    6 +-
 framework/Imap_Client/locale/Horde_Imap_Client.pot                |   70 +-
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 7305 -> 7305 bytes
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.po  |   70 +-
 framework/Imap_Client/package.xml                                 |   24 +-
 framework/Kolab_Format/package.xml                                |   21 +-
 framework/Kolab_Server/package.xml                                |   21 +-
 framework/Kolab_Storage/package.xml                               |   21 +-
 framework/Lock/package.xml                                        |   27 +-
 framework/Mail/package.xml                                        |   21 +-
 framework/Memcache/package.xml                                    |   21 +-
 framework/Mime_Viewer/package.xml                                 |   23 +-
 framework/Pear/package.xml                                        |   25 +-
 framework/Perms/package.xml                                       |   23 +-
 framework/Prefs/locale/Horde_Prefs.pot                            |    8 +-
 framework/Prefs/locale/de/LC_MESSAGES/Horde_Prefs.mo              |  Bin 1031 -> 1031 bytes
 framework/Prefs/locale/de/LC_MESSAGES/Horde_Prefs.po              |    8 +-
 framework/Prefs/package.xml                                       |   22 +-
 framework/Rdo/package.xml                                         |   21 +-
 framework/Serialize/package.xml                                   |   21 +-
 framework/Service_Facebook/package.xml                            |   21 +-
 framework/Service_Twitter/package.xml                             |   21 +-
 framework/Service_Weather/package.xml                             |   21 +-
 framework/SessionHandler/package.xml                              |   21 +-
 framework/Share/package.xml                                       |   23 +-
 framework/Support/lib/Horde/Support/Stub.php                      |   70 +-
 framework/Support/package.xml                                     |   25 +-
 framework/SyncMl/package.xml                                      |   21 +-
 framework/Test/package.xml                                        |   21 +-
 framework/Text_Diff/package.xml                                   |   21 +-
 framework/Text_Filter/package.xml                                 |   23 +-
 framework/Tree/package.xml                                        |   25 +-
 framework/Url/package.xml                                         |   23 +-
 framework/Util/package.xml                                        |   21 +-
 framework/Yaml/package.xml                                        |   23 +-
 gollem/locale/de/LC_MESSAGES/gollem.mo                            |  Bin 73418 -> 73047 bytes
 hermes/locale/de/LC_MESSAGES/hermes.mo                            |  Bin 79861 -> 79813 bytes
 hermes/locale/de/LC_MESSAGES/hermes.po                            |  210 ++--
 hermes/locale/hermes.pot                                          |  206 ++--
 horde/docs/CHANGES                                                |    2 +
 horde/js/login.js                                                 |    9 +-
 horde/locale/de/LC_MESSAGES/horde.mo                              |  Bin 65285 -> 64938 bytes
 horde/locale/de/LC_MESSAGES/horde.po                              |   47 +-
 horde/locale/horde.pot                                            |   49 +-
 horde/login.php                                                   |   44 +-
 horde/package.xml                                                 |    2 +
 horde/templates/login/login.inc                                   |   15 +
 imp/locale/de/LC_MESSAGES/imp.mo                                  |  Bin 181520 -> 181260 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                  |  304 ++--
 imp/locale/imp.pot                                                |  304 ++--
 ingo/locale/de/LC_MESSAGES/ingo.mo                                |  Bin 84603 -> 84240 bytes
 ingo/locale/de/LC_MESSAGES/ingo.po                                |    8 +-
 ingo/locale/ingo.pot                                              |   10 +-
 jonah/locale/de/LC_MESSAGES/jonah.mo                              |  Bin 75179 -> 74848 bytes
 klutz/locale/de/LC_MESSAGES/klutz.mo                              |  Bin 69993 -> 69670 bytes
 kronolith/locale/de/LC_MESSAGES/kronolith.mo                      |  Bin 125921 -> 125502 bytes
 kronolith/locale/de/LC_MESSAGES/kronolith.po                      |  142 +-
 kronolith/locale/kronolith.pot                                    |  144 +-
 luxor/locale/de/LC_MESSAGES/luxor.mo                              |  Bin 67302 -> 66979 bytes
 mnemo/locale/de/LC_MESSAGES/mnemo.mo                              |  Bin 74851 -> 74528 bytes
 nag/locale/de/LC_MESSAGES/nag.mo                                  |  Bin 90801 -> 90446 bytes
 nag/locale/de/LC_MESSAGES/nag.po                                  |    4 +-
 nag/locale/nag.pot                                                |    4 +-
 passwd/locale/de/LC_MESSAGES/passwd.mo                            |  Bin 71235 -> 70888 bytes
 sam/locale/de/LC_MESSAGES/sam.mo                                  |  Bin 69335 -> 69012 bytes
 sesha/locale/de/LC_MESSAGES/sesha.mo                              |  Bin 74072 -> 73709 bytes
 skeleton/locale/skeleton.pot                                      |   22 +-
 timeobjects/locale/de/LC_MESSAGES/timeobjects.mo                  |  Bin 65822 -> 65475 bytes
 trean/locale/de/LC_MESSAGES/trean.mo                              |  Bin 69605 -> 69282 bytes
 turba/locale/de/LC_MESSAGES/turba.mo                              |  Bin 97175 -> 96852 bytes
 ulaform/locale/de/LC_MESSAGES/ulaform.mo                          |  Bin 71054 -> 70707 bytes
 vilma/locale/de/LC_MESSAGES/vilma.mo                              |  Bin 76701 -> 76378 bytes
 whups/locale/de/LC_MESSAGES/whups.mo                              |  Bin 107023 -> 106636 bytes
 wicked/locale/de/LC_MESSAGES/wicked.mo                            |  Bin 79732 -> 79385 bytes
 121 files changed, 2254 insertions(+), 1714 deletions(-)

http://git.horde.org/horde-git/-/commit/35ca36ae0ea4dd505aa935a6843946606236fbcc

-----------------------------------------------------------------------

commit 93141da68176921d9e8a0589f92802949e65e393
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 02:11:15 2013 -0700

    phpdoc

 framework/Cache/lib/Horde/Cache/Storage/File.php |   40 ++++++++++++---------
 1 files changed, 23 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/93141da68176921d9e8a0589f92802949e65e393

-----------------------------------------------------------------------

commit 711e62c130b4fdff9703a20af33098600db84a6f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 13:14:31 2013 -0700

    Fix __isset()

 imp/lib/Imap/Config.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/711e62c130b4fdff9703a20af33098600db84a6f

-----------------------------------------------------------------------

commit 79b4a5fadf29ceb0a7a4a42c872b47658731087f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 13:16:29 2013 -0700

    Fix dangling closing XML tag

 imp/config/conf.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/79b4a5fadf29ceb0a7a4a42c872b47658731087f

-----------------------------------------------------------------------

commit a8950c412a6105fa10f7b060ddf9963e80a25a1c
Merge: 79b4a5f a8fb101
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 13:17:53 2013 -0700

    Merge branch 'master' into imp_6_1

 .travis.yml                                                |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php |    2 +-
 framework/Autoloader_Cache/lib/Horde/Autoloader/Cache.php  |   15 +++-
 framework/Autoloader_Cache/package.xml                     |   11 +++-
 framework/Cli_Modular/lib/Horde/Cli/Modular.php            |   10 +--
 framework/Cli_Modular/lib/Horde/Cli/Modular/Module.php     |   39 ++++++------
 framework/Core/lib/Horde.php                               |    6 +-
 framework/Core/lib/Horde/Core/Factory/Cache.php            |    2 +-
 framework/Core/lib/Horde/Core/Log/Wrapper.php              |   37 +++++++++++
 framework/Core/lib/Horde/Session.php                       |   10 ++--
 framework/Core/lib/Horde/Session/Null.php                  |   11 +++-
 framework/Core/package.xml                                 |   16 +++--
 turba/docs/CHANGES                                         |    2 +
 turba/lib/Data/Ldif.php                                    |    2 +-
 turba/lib/Driver/Ldap.php                                  |    4 +-
 turba/package.xml                                          |    4 +-
 16 files changed, 119 insertions(+), 54 deletions(-)

http://git.horde.org/horde-git/-/commit/a8950c412a6105fa10f7b060ddf9963e80a25a1c

-----------------------------------------------------------------------

commit fcd8d301081487ec0dea37fa56390bfa5a33c9fc
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 15:39:25 2013 -0700

    Re-add caching of backends file

 imp/lib/Imap.php |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

http://git.horde.org/horde-git/-/commit/fcd8d301081487ec0dea37fa56390bfa5a33c9fc

-----------------------------------------------------------------------

commit 34a95a617541fd755fb1a63c6772c8fa39c3ae53
Merge: fcd8d30 dc0dfa9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 16:11:12 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	framework/Cache/lib/Horde/Cache/Storage/File.php

 framework/Cache/lib/Horde/Cache/Storage/Apc.php                   |   29 ++-
 framework/Cache/lib/Horde/Cache/Storage/Base.php                  |   51 +++-
 framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php          |   26 +-
 framework/Cache/lib/Horde/Cache/Storage/File.php                  |   31 +--
 framework/Cache/lib/Horde/Cache/Storage/Memcache.php              |   63 ++---
 framework/Cache/lib/Horde/Cache/Storage/Mock.php                  |   34 ++-
 framework/Cache/lib/Horde/Cache/Storage/Null.php                  |   20 +-
 framework/Cache/lib/Horde/Cache/Storage/Session.php               |   32 ++-
 framework/Cache/lib/Horde/Cache/Storage/Sql.php                   |   55 ++--
 framework/Cache/lib/Horde/Cache/Storage/Stack.php                 |   43 ++-
 framework/Cache/lib/Horde/Cache/Storage/Xcache.php                |   26 +-
 framework/Cache/package.xml                                       |    4 +-
 framework/Core/lib/Horde.php                                      |   69 +++--
 framework/Core/lib/Horde/Core/Ajax/Application/Handler/Groups.php |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/ContactAutoCompleter.php |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php         |    2 +-
 framework/Core/lib/Horde/Core/Auth/Shibboleth.php                 |    2 +-
 framework/Core/lib/Horde/Core/Factory/Logger.php                  |   54 ++++-
 framework/Core/lib/Horde/Core/Factory/Prefs.php                   |    2 +-
 .../lib/Horde/Core/Notification/Handler/Decorator/Hordelog.php    |    4 +-
 framework/Core/lib/Horde/Core/Prefs/Ui.php                        |    2 +-
 framework/Core/lib/Horde/Core/Share/Driver.php                    |    4 +-
 framework/Core/lib/Horde/Core/Topbar.php                          |    2 +-
 framework/Core/lib/Horde/ErrorHandler.php                         |    2 +-
 framework/Core/lib/Horde/Registry.php                             |   31 ++-
 framework/Core/lib/Horde/Session.php                              |    2 +-
 framework/Core/lib/Horde/Themes/Element.php                       |    2 +-
 framework/Core/package.xml                                        |    2 +
 28 files changed, 378 insertions(+), 220 deletions(-)

http://git.horde.org/horde-git/-/commit/34a95a617541fd755fb1a63c6772c8fa39c3ae53

-----------------------------------------------------------------------

commit b1e4cd48cfeb2c76c76e2699a0c3afb692ee3858
Merge: 34a95a6 8f83331
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Mar 7 15:52:59 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/IMP.php
    	imp/search.php
    	imp/themes/default/dynamic/screen.css

 framework/Prefs/lib/Horde/Prefs/Scope.php |  148 ++++++++++++++++++----------
 framework/Prefs/package.xml               |    4 +-
 imp/js/dimpbase.js                        |   13 ++-
 imp/lib/Basic/Search.php                  |    3 +
 imp/themes/default/dynamic/screen.css     |    2 +-
 5 files changed, 111 insertions(+), 59 deletions(-)

http://git.horde.org/horde-git/-/commit/b1e4cd48cfeb2c76c76e2699a0c3afb692ee3858

-----------------------------------------------------------------------

commit 6ba474ab43a21d857d46c6e00cdd6e55d48a53da
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Mar 7 18:07:58 2013 -0700

    Maybe a slightly more useful error message?

 imp/lib/Imap.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/6ba474ab43a21d857d46c6e00cdd6e55d48a53da

-----------------------------------------------------------------------

commit fb5da829f263520515343296a7d72dfab6c838dc
Merge: 6ba474a c12829c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 8 15:18:09 2013 -0700

    Merge branch 'master' into imp_6_1

 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |    7 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php        |   11 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Contact.php     |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php  |    2 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php   |   65 ++-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php   |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php        |   75 ++--
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |  101 +++--
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |    7 +-
 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php           |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Utils.php               |    5 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php       |    4 +-
 framework/Cache/lib/Horde/Cache/Storage/Stack.php                 |    2 +-
 framework/Core/lib/Horde/Core/ActiveSync/Logger/Factory.php       |    2 +-
 framework/Core/package.xml                                        |   26 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |   12 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |    7 +-
 framework/Imap_Client/package.xml                                 |   22 +-
 framework/Rpc/lib/Horde/Rpc/ActiveSync.php                        |   13 +-
 horde/rpc.php                                                     |    1 -
 horde/templates/login/smartmobile.html.php                        |   13 +
 nag/docs/CHANGES                                                  |    1 +
 nag/js/smartmobile.js                                             |    5 +-
 nag/lib/Ajax/Application/Handler/Smartmobile.php                  |    2 +-
 nag/lib/Tasklist.php                                              |    2 +-
 nag/package.xml                                                   |    2 +
 27 files changed, 254 insertions(+), 148 deletions(-)

http://git.horde.org/horde-git/-/commit/fb5da829f263520515343296a7d72dfab6c838dc

-----------------------------------------------------------------------

commit d068b98dfc6ba998bc3ae647faae9659dc42ec62
Merge: fb5da82 62d84aa
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 8 16:49:15 2013 -0700

    Merge branch 'master' into imp_6_1

 horde/js/login.js             |    2 +-
 horde/js/smartmobile-login.js |   27 ++++++++++++++++++++++++---
 horde/login.php               |    2 +-
 imp/js/login.js               |   25 ++++++++-----------------
 imp/lib/Application.php       |    2 +-
 ingo/docs/CHANGES             |    1 +
 ingo/lib/Ingo.php             |    2 +-
 ingo/package.xml              |    2 ++
 8 files changed, 39 insertions(+), 24 deletions(-)

http://git.horde.org/horde-git/-/commit/d068b98dfc6ba998bc3ae647faae9659dc42ec62

-----------------------------------------------------------------------

commit dae6be3107e3c7aed30db5f02637ec269e901c76
Merge: d068b98 68bdcf7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 8 16:56:35 2013 -0700

    Merge branch 'master' into imp_6_1

 imp/js/smartmobile.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/dae6be3107e3c7aed30db5f02637ec269e901c76

-----------------------------------------------------------------------

commit 633620d014328b139282e38712cdfa02d8936be9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 8 17:01:54 2013 -0700

    Destination mailbox when copying/moving message in smartmobile view cannot be empty

 imp/js/smartmobile.js   |    6 +++++-
 imp/lib/Smartmobile.php |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/633620d014328b139282e38712cdfa02d8936be9

-----------------------------------------------------------------------

commit d1fe98c16e9b1263acb6c4726c1562ec50c2776c
Merge: 633620d fe485e0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 15:35:43 2013 -0600

    Merge branch 'master' into imp_6_1

 .travis.yml                                                 |    2 +-
 ansel/lib/View/Ansel.php                                    |    5 +-
 framework/ActiveSync/lib/Horde/ActiveSync.php               |    7 ++-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php     |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php |    6 +-
 framework/ActiveSync/package.xml                            |   23 ++++++-
 framework/Core/lib/Horde.php                                |    3 +-
 framework/Core/package.xml                                  |   21 ++++++-
 framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php     |    5 ++
 framework/Db/package.xml                                    |    4 +-
 framework/Db/test/Horde/Db/Adapter/MysqlTest.php            |    4 +
 framework/Db/test/Horde/Db/Adapter/MysqliTest.php           |    4 +
 framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php        |    4 +
 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php        |    4 +
 framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php       |    4 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php        |   11 ++--
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php      |    7 +--
 hermes/lib/Form/Search.php                                  |    2 +-
 horde/lib/LoginTasks/Task/AdminCheck.php                    |   19 ++----
 ingo/lib/Ingo.php                                           |    9 ++-
 mnemo/lib/Driver.php                                        |    2 +-
 nag/docs/CHANGES                                            |    1 +
 nag/migration/12_nag_fix_smartlists.php                     |   32 +++++++++++
 nag/package.xml                                             |   10 ++-
 24 files changed, 141 insertions(+), 51 deletions(-)

http://git.horde.org/horde-git/-/commit/d1fe98c16e9b1263acb6c4726c1562ec50c2776c

-----------------------------------------------------------------------

commit 2dc187c45f685180bc349e006c26144c43144209
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 15:42:53 2013 -0600

    Remove dimp_messageview and dimp_previewview hooks

 imp/config/hooks.php.dist                |   51 ------------------------------
 imp/docs/UPGRADING                       |    2 +
 imp/lib/Ajax/Application/ShowMessage.php |   12 -------
 3 files changed, 2 insertions(+), 63 deletions(-)

http://git.horde.org/horde-git/-/commit/2dc187c45f685180bc349e006c26144c43144209

-----------------------------------------------------------------------

commit a3594cf772f56a1cfba76bfc7cc4d78c95385dcf
Merge: 2dc187c 3b903c6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 16:35:36 2013 -0600

    Merge branch 'master' into imp_6_1

 framework/Core/lib/Horde/Core/Ajax/Application.php    |   16 +++++----
 framework/Core/package.xml                            |    4 +-
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING |   10 +++++-
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php  |   29 ++++++++++++++++-
 framework/Imap_Client/package.xml                     |   12 +++---
 imp/lib/Mbox/Generate.php                             |    6 ++-
 6 files changed, 58 insertions(+), 19 deletions(-)

http://git.horde.org/horde-git/-/commit/a3594cf772f56a1cfba76bfc7cc4d78c95385dcf

-----------------------------------------------------------------------

commit 2ddb77b970cccd70d386b754e0b3bc7f59b73a7a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 18:28:08 2013 -0600

    Update phpdoc

 framework/Imap_Client/lib/Horde/Imap/Client/Data/Sync.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/2ddb77b970cccd70d386b754e0b3bc7f59b73a7a

-----------------------------------------------------------------------

commit 8299261b4b44960b3b3103bdeb70fa08c8267326
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 18:45:33 2013 -0600

    [mms] Add properties to Sync object to allow retrieval of previous sync state status.

 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING     |   10 ++
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php      |   17 ++-
 framework/Imap_Client/lib/Horde/Imap/Client/Data/Sync.php |   84 ++++++++++--
 framework/Imap_Client/package.xml                         |    2 +
 4 files changed, 92 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/8299261b4b44960b3b3103bdeb70fa08c8267326

-----------------------------------------------------------------------

commit 2f0ba0ad4665ffd816102d14898a4bdc34deb7a5
Merge: 8299261 5761155
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 19:00:17 2013 -0600

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	framework/Imap_Client/package.xml
    	imp/lib/Ajax/Application/ListMessages.php

 framework/Imap_Client/lib/Horde/Imap/Client/Base.php   |   55 ++++++++++++--
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |   64 ++--------------
 framework/Imap_Client/package.xml                      |    2 +
 imp/lib/Ajax/Application/ListMessages.php              |    2 +-
 4 files changed, 58 insertions(+), 65 deletions(-)

http://git.horde.org/horde-git/-/commit/2f0ba0ad4665ffd816102d14898a4bdc34deb7a5

-----------------------------------------------------------------------

commit 1c4748a7a50cb812bebcf17745f8ac0d9311523d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 19:56:33 2013 -0600

    [mms] Better handling of flag change attempts when browser cached state (dynamic/smartmobile view) is different than the server state.
    
    Ignore system flag changes - this only applies to user-defined flags.

 imp/docs/CHANGES                             |    2 +
 imp/lib/Ajax/Application/Handler/Dynamic.php |   31 ++++++++++++++++++-
 imp/lib/Message.php                          |   42 +++++++++++++++++++++-----
 imp/package.xml                              |    3 +-
 4 files changed, 68 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/1c4748a7a50cb812bebcf17745f8ac0d9311523d

-----------------------------------------------------------------------

commit 375a787fe1fb8229ca22232fdaec0a912737488a
Merge: 1c4748a 5fde943
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 20:00:44 2013 -0600

    Merge branch 'master' into imp_6_1

 framework/Imap_Client/lib/Horde/Imap/Client/Data/Sync.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/375a787fe1fb8229ca22232fdaec0a912737488a

-----------------------------------------------------------------------

commit c9fca9e1514d5aff7c188ca9a2322faeb1443201
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 20:08:52 2013 -0600

    requestid might be empty

 imp/js/dimpbase.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/c9fca9e1514d5aff7c188ca9a2322faeb1443201

-----------------------------------------------------------------------

commit 2de294159fb96da2e7a753e89c1bcb96856fa1f9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 20:14:44 2013 -0600

    Fixes to new MODIFIED checking code

 imp/lib/Ajax/Application/Handler/Dynamic.php |    9 ++++++---
 imp/lib/Message.php                          |    4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/2de294159fb96da2e7a753e89c1bcb96856fa1f9

-----------------------------------------------------------------------

commit 67806ee4eb1f9a7b7cd4d502aec551b37ceb8bad
Merge: 2de2941 df0a28b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 11 23:06:37 2013 -0600

    Merge branch 'master' into imp_6_1

 framework/Autoloader_Cache/bin/horde-autoloader-cache-prune |    6 +-
 framework/Autoloader_Cache/lib/Horde/Autoloader/Cache.php   |   66 +++++++----
 framework/Autoloader_Cache/package.xml                      |   31 ++++-
 3 files changed, 73 insertions(+), 30 deletions(-)

http://git.horde.org/horde-git/-/commit/67806ee4eb1f9a7b7cd4d502aec551b37ceb8bad

-----------------------------------------------------------------------

commit 161047ba95f193f7aa96c41507daae03a4481817
Merge: 67806ee 60bc87c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 12 23:55:08 2013 -0600

    Merge branch 'master' into imp_6_1

 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php |    1 +
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php     |    2 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php        |    1 +
 framework/Core/lib/Horde/Core/Factory/Logger.php           |   15 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php     |    4 +-
 horde/config/conf.xml                                      |    2 +-
 horde/lib/Api.php                                          |   52 ++-
 passwd/README                                              |    2 +-
 passwd/config/backends.php                                 |  233 ++++------
 passwd/config/hooks.php.dist                               |   63 +--
 passwd/docs/CHANGES                                        |    2 +
 passwd/docs/CREDITS                                        |    6 +-
 passwd/docs/INSTALL                                        |   12 +-
 passwd/docs/UPGRADING                                      |   31 +-
 passwd/index.php                                           |  228 +---------
 passwd/js/passwd.js                                        |   11 +-
 passwd/lib/Application.php                                 |   30 +-
 passwd/lib/Basic.php                                       |  282 ++++++++++++
 passwd/lib/Driver.php                                      |   69 ++-
 passwd/lib/Driver/Adsi.php                                 |   45 +-
 passwd/lib/Driver/Composite.php                            |   93 ++---
 passwd/lib/Driver/Expect.php                               |   47 +-
 passwd/lib/Driver/Expectpecl.php                           |  116 +++--
 passwd/lib/Driver/Horde.php                                |   44 +-
 passwd/lib/Driver/Http.php                                 |   69 ++--
 passwd/lib/Driver/Kolab.php                                |   52 ++-
 passwd/lib/Driver/Ldap.php                                 |  144 +++---
 passwd/lib/Driver/Null.php                                 |   31 ++
 passwd/lib/Driver/Pine.php                                 |  141 +++---
 passwd/lib/Driver/Poppassd.php                             |   76 ++--
 passwd/lib/Driver/Procopen.php                             |   45 +-
 passwd/lib/Driver/Pspasswd.php                             |   56 ++--
 passwd/lib/Driver/Servuftp.php                             |   77 ++-
 passwd/lib/Driver/Smbldap.php                              |   66 ++--
 passwd/lib/Driver/Smbpasswd.php                            |   64 ++--
 passwd/lib/Driver/Soap.php                                 |   56 ++--
 passwd/lib/Driver/Sql.php                                  |  132 +++---
 passwd/lib/Driver/Vmailmgr.php                             |   36 +-
 passwd/lib/Driver/Vpopmail.php                             |  119 +++---
 passwd/lib/Exception.php                                   |   18 +-
 passwd/lib/Factory/Driver.php                              |   97 +++--
 passwd/lib/Passwd.php                                      |  106 -----
 passwd/lib/Test.php                                        |   40 +-
 passwd/locale/en/help.xml                                  |   21 +-
 passwd/package.xml                                         |   25 +-
 passwd/templates/index.html.php                            |   34 +-
 passwd/test/Passwd/Autoload.php                            |   10 +-
 passwd/test/Passwd/TestCase.php                            |   39 +--
 passwd/test/Passwd/Unit/Driver/SqlTest.php                 |   39 ++-
 passwd/test/Passwd/Unit/Factory/DriverTest.php             |   68 ++--
 50 files changed, 1569 insertions(+), 1483 deletions(-)

http://git.horde.org/horde-git/-/commit/161047ba95f193f7aa96c41507daae03a4481817

-----------------------------------------------------------------------

commit 8e70c087c042062fe0ee9b48716a1eaecc475642
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 12 23:57:19 2013 -0600

    more better english

 imp/lib/Imap.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8e70c087c042062fe0ee9b48716a1eaecc475642

-----------------------------------------------------------------------

commit 7f20142eacc36cd6232e84155e9b0d9236c5d737
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 13 00:05:13 2013 -0600

    ajaxaction is a very specialized hook - no need to provide example here

 imp/config/hooks.php.dist |   22 ----------------------
 1 files changed, 0 insertions(+), 22 deletions(-)

http://git.horde.org/horde-git/-/commit/7f20142eacc36cd6232e84155e9b0d9236c5d737

-----------------------------------------------------------------------

commit a1ccb077d6bc1a8a95d6c0c82425912fcd8e8ce1
Merge: 7f20142 c7eea0d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 15 19:03:02 2013 -0600

    Merge branch 'master' into imp_6_1

 ansel/lib/Ansel.php                                               |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php        |    6 +-
 framework/ActiveSync/locale/eu/LC_MESSAGES/Horde_ActiveSync.mo    |  Bin 944 -> 981 bytes
 framework/ActiveSync/locale/eu/LC_MESSAGES/Horde_ActiveSync.po    |    6 +-
 framework/Alarm/locale/eu/LC_MESSAGES/Horde_Alarm.mo              |  Bin 762 -> 772 bytes
 framework/Alarm/locale/eu/LC_MESSAGES/Horde_Alarm.po              |    9 +-
 framework/Argv/locale/eu/LC_MESSAGES/Horde_Argv.mo                |  Bin 585 -> 596 bytes
 framework/Argv/locale/eu/LC_MESSAGES/Horde_Argv.po                |    5 +-
 framework/Auth/lib/Horde/Auth/Ldap.php                            |    4 +-
 framework/Auth/locale/eu/LC_MESSAGES/Horde_Auth.mo                |  Bin 742 -> 753 bytes
 framework/Auth/locale/eu/LC_MESSAGES/Horde_Auth.po                |   31 +-
 framework/Browser/locale/eu/LC_MESSAGES/Horde_Browser.mo          |  Bin 1149 -> 1160 bytes
 framework/Browser/locale/eu/LC_MESSAGES/Horde_Browser.po          |    5 +-
 framework/Cli/locale/eu/LC_MESSAGES/Horde_Cli.mo                  |  Bin 696 -> 707 bytes
 framework/Cli/locale/eu/LC_MESSAGES/Horde_Cli.po                  |    5 +-
 framework/Compress/locale/eu/LC_MESSAGES/Horde_Compress.mo        |  Bin 731 -> 983 bytes
 framework/Compress/locale/eu/LC_MESSAGES/Horde_Compress.po        |    9 +-
 framework/Core/lib/Horde.php                                      |  287 +-
 framework/Core/lib/Horde/Config.php                               |   26 +-
 framework/Core/lib/Horde/Core/Db/Migration.php                    |   31 +-
 framework/Core/lib/Horde/Deprecated.php                           |  105 +
 framework/Core/lib/Horde/Themes/Image.php                         |  122 +-
 framework/Core/locale/eu/LC_MESSAGES/Horde_Core.mo                |  Bin 5850 -> 19198 bytes
 framework/Core/locale/eu/LC_MESSAGES/Horde_Core.po                |  567 +-
 framework/Core/package.xml                                        |   16 +-
 framework/Crypt/locale/eu/LC_MESSAGES/Horde_Crypt.mo              |  Bin 805 -> 1893 bytes
 framework/Crypt/locale/eu/LC_MESSAGES/Horde_Crypt.po              |  116 +-
 framework/Data/locale/eu/LC_MESSAGES/Horde_Data.mo                |  Bin 851 -> 1262 bytes
 framework/Data/locale/eu/LC_MESSAGES/Horde_Data.po                |   11 +-
 framework/Date/locale/eu/LC_MESSAGES/Horde_Date.mo                |  Bin 488 -> 1189 bytes
 framework/Date/locale/eu/LC_MESSAGES/Horde_Date.po                |   62 +-
 framework/Exception/locale/eu/LC_MESSAGES/Horde_Exception.mo      |  Bin 591 -> 602 bytes
 framework/Exception/locale/eu/LC_MESSAGES/Horde_Exception.po      |    5 +-
 framework/Form/locale/eu/LC_MESSAGES/Horde_Form.mo                |  Bin 1098 -> 1997 bytes
 framework/Form/locale/eu/LC_MESSAGES/Horde_Form.po                |   61 +-
 framework/Icalendar/locale/eu/LC_MESSAGES/Horde_Icalendar.mo      |  Bin 553 -> 564 bytes
 framework/Icalendar/locale/eu/LC_MESSAGES/Horde_Icalendar.po      |    5 +-
 framework/Image/locale/eu/LC_MESSAGES/Horde_Image.mo              |  Bin 1279 -> 1352 bytes
 framework/Image/locale/eu/LC_MESSAGES/Horde_Image.po              |   12 +-
 framework/Imap_Client/locale/eu/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 1408 -> 2044 bytes
 framework/Imap_Client/locale/eu/LC_MESSAGES/Horde_Imap_Client.po  |  135 +-
 framework/Imsp/locale/eu/LC_MESSAGES/Horde_Imsp.mo                |  Bin 569 -> 580 bytes
 framework/Imsp/locale/eu/LC_MESSAGES/Horde_Imsp.po                |    5 +-
 framework/Itip/locale/eu/LC_MESSAGES/Horde_Itip.mo                |  Bin 603 -> 1432 bytes
 framework/Itip/locale/eu/LC_MESSAGES/Horde_Itip.po                |   23 +-
 framework/Kolab_Cli/locale/eu/LC_MESSAGES/Horde_Kolab_Cli.mo      |  Bin 492 -> 959 bytes
 framework/Kolab_Cli/locale/eu/LC_MESSAGES/Horde_Kolab_Cli.po      |   22 +-
 .../Kolab_FreeBusy/locale/eu/LC_MESSAGES/Horde_Kolab_FreeBusy.mo  |  Bin 623 -> 983 bytes
 .../Kolab_FreeBusy/locale/eu/LC_MESSAGES/Horde_Kolab_FreeBusy.po  |   20 +-
 .../Kolab_Resource/locale/eu/LC_MESSAGES/Horde_Kolab_Resource.mo  |  Bin 988 -> 999 bytes
 .../Kolab_Resource/locale/eu/LC_MESSAGES/Horde_Kolab_Resource.po  |    5 +-
 .../Kolab_Storage/locale/eu/LC_MESSAGES/Horde_Kolab_Storage.mo    |  Bin 496 -> 806 bytes
 .../Kolab_Storage/locale/eu/LC_MESSAGES/Horde_Kolab_Storage.po    |   33 +-
 framework/LoginTasks/locale/eu/LC_MESSAGES/Horde_LoginTasks.mo    |  Bin 696 -> 707 bytes
 framework/LoginTasks/locale/eu/LC_MESSAGES/Horde_LoginTasks.po    |    5 +-
 framework/Mail/lib/Horde/Mail/Transport.php                       |   22 +-
 framework/Mail/package.xml                                        |    4 +-
 framework/Mail/test/Horde/Mail/SendTest.php                       |   15 +
 framework/Mime/locale/eu/LC_MESSAGES/Horde_Mime.mo                |  Bin 1318 -> 1329 bytes
 framework/Mime/locale/eu/LC_MESSAGES/Horde_Mime.po                |    5 +-
 framework/Mime_Viewer/locale/eu/LC_MESSAGES/Horde_Mime_Viewer.mo  |  Bin 1559 -> 1570 bytes
 framework/Mime_Viewer/locale/eu/LC_MESSAGES/Horde_Mime_Viewer.po  |    5 +-
 framework/Model/locale/eu/LC_MESSAGES/Horde_Model.mo              |  Bin 1296 -> 2980 bytes
 framework/Model/locale/eu/LC_MESSAGES/Horde_Model.po              |  107 +-
 framework/Nls/locale/eu/LC_MESSAGES/Horde_Nls.mo                  |  Bin 592 -> 2485 bytes
 framework/Nls/locale/eu/LC_MESSAGES/Horde_Nls.po                  |  103 +-
 framework/Perms/locale/eu/LC_MESSAGES/Horde_Perms.mo              |  Bin 855 -> 866 bytes
 framework/Perms/locale/eu/LC_MESSAGES/Horde_Perms.po              |    5 +-
 framework/Prefs/locale/eu/LC_MESSAGES/Horde_Prefs.mo              |  Bin 1071 -> 1082 bytes
 framework/Prefs/locale/eu/LC_MESSAGES/Horde_Prefs.po              |    5 +-
 framework/Push/locale/eu/LC_MESSAGES/Horde_Push.mo                |  Bin 487 -> 767 bytes
 framework/Push/locale/eu/LC_MESSAGES/Horde_Push.po                |   11 +-
 framework/Rpc/locale/eu/LC_MESSAGES/Horde_Rpc.mo                  |  Bin 560 -> 571 bytes
 framework/Rpc/locale/eu/LC_MESSAGES/Horde_Rpc.po                  |    5 +-
 .../locale/eu/LC_MESSAGES/Horde_Service_Facebook.mo               |  Bin 717 -> 728 bytes
 .../locale/eu/LC_MESSAGES/Horde_Service_Facebook.po               |    5 +-
 .../Service_Scribd/locale/eu/LC_MESSAGES/Horde_Service_Scribd.mo  |  Bin 557 -> 568 bytes
 .../Service_Scribd/locale/eu/LC_MESSAGES/Horde_Service_Scribd.po  |    5 +-
 .../locale/eu/LC_MESSAGES/Horde_Service_Weather.mo                |  Bin 782 -> 868 bytes
 .../locale/eu/LC_MESSAGES/Horde_Service_Weather.po                |   26 +-
 .../test/Horde/SessionHandler/Storage/StackTest.php               |    2 +-
 framework/Share/locale/eu/LC_MESSAGES/Horde_Share.mo              |  Bin 626 -> 637 bytes
 framework/Share/locale/eu/LC_MESSAGES/Horde_Share.po              |    5 +-
 framework/SyncMl/locale/eu/LC_MESSAGES/Horde_SyncMl.mo            |  Bin 565 -> 576 bytes
 framework/SyncMl/locale/eu/LC_MESSAGES/Horde_SyncMl.po            |    5 +-
 framework/Text_Filter/locale/eu/LC_MESSAGES/Horde_Text_Filter.mo  |  Bin 532 -> 543 bytes
 framework/Text_Filter/locale/eu/LC_MESSAGES/Horde_Text_Filter.po  |    5 +-
 framework/Token/locale/eu/LC_MESSAGES/Horde_Token.mo              |  Bin 488 -> 499 bytes
 framework/Token/locale/eu/LC_MESSAGES/Horde_Token.po              |    5 +-
 framework/Vcs/test/Horde/Vcs/CvsTest.php                          |    8 +
 framework/Vcs/test/Horde/Vcs/SvnTest.php                          |    8 +
 framework/Vfs/locale/eu/LC_MESSAGES/Horde_Vfs.mo                  |  Bin 678 -> 689 bytes
 framework/Vfs/locale/eu/LC_MESSAGES/Horde_Vfs.po                  |    5 +-
 framework/Vfs/test/Horde/Vfs/FileTest.php                         |    6 +-
 gollem/locale/eu/LC_MESSAGES/gollem.mo                            |  Bin 72426 -> 71826 bytes
 gollem/locale/eu/LC_MESSAGES/gollem.po                            |  236 +-
 horde/locale/eu/LC_MESSAGES/horde.mo                              |  Bin 64314 -> 63610 bytes
 horde/locale/eu/LC_MESSAGES/horde.po                              | 1534 +-
 horde/locale/eu/help.xml                                          |   12 +-
 horde/templates/prefs/activesync.html                             |    2 +-
 imp/locale/de/LC_MESSAGES/imp.mo                                  |  Bin 181260 -> 181259 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                  |    4 +-
 imp/locale/eu/LC_MESSAGES/imp.mo                                  |  Bin 181856 -> 175647 bytes
 imp/locale/eu/LC_MESSAGES/imp.po                                  | 4525 ++---
 imp/locale/eu/help.xml                                            |  684 +-
 ingo/locale/eu/LC_MESSAGES/ingo.mo                                |  Bin 81975 -> 82436 bytes
 ingo/locale/eu/LC_MESSAGES/ingo.po                                |  531 +-
 ingo/locale/eu/help.xml                                           |    8 +-
 kronolith/locale/eu/LC_MESSAGES/kronolith.mo                      |  Bin 124127 -> 122953 bytes
 kronolith/locale/eu/LC_MESSAGES/kronolith.po                      | 1819 +-
 mnemo/locale/eu/LC_MESSAGES/mnemo.mo                              |  Bin 74245 -> 72826 bytes
 mnemo/locale/eu/LC_MESSAGES/mnemo.po                              |  312 +-
 mnemo/locale/eu/help.xml                                          |    2 +-
 nag/locale/eu/LC_MESSAGES/nag.mo                                  |  Bin 88756 -> 88412 bytes
 nag/locale/eu/LC_MESSAGES/nag.po                                  |  993 +-
 timeobjects/locale/eu/LC_MESSAGES/timeobjects.mo                  |  Bin 64818 -> 64133 bytes
 timeobjects/locale/eu/LC_MESSAGES/timeobjects.po                  |   14 +-
 turba/locale/eu/LC_MESSAGES/turba.mo                              |  Bin 95563 -> 94710 bytes
 turba/locale/eu/LC_MESSAGES/turba.po                              |  734 +-
 119 files changed, 6655 insertions(+), 6883 deletions(-)

http://git.horde.org/horde-git/-/commit/a1ccb077d6bc1a8a95d6c0c82425912fcd8e8ce1

-----------------------------------------------------------------------

commit 5307efdd5822cd6e65ba561b133145ca210bb1f8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 01:09:49 2013 -0400

    Expose the Maillog via the public API, add ability to poll for changes.

 imp/lib/Api.php     |   42 ++++++++++++++++++++++++++++++++++++++++++
 imp/lib/Maillog.php |   14 ++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/5307efdd5822cd6e65ba561b133145ca210bb1f8

-----------------------------------------------------------------------

commit 17b2e1695378496d1fff4273b2551003d6abdb5f
Merge: 5307efd c421d37
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 01:13:28 2013 -0400

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/Mime/Viewer/Plain.php
    	imp/package.xml

 chora/locale/pt_BR/LC_MESSAGES/chora.mo                           |  Bin 72001 -> 71212 bytes
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php        |    8 +-
 .../lib/Horde/ActiveSync/Message/AirSyncBaseAttachment.php        |   11 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php        |    6 +
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |    1 +
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |   16 +-
 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php           |    5 +-
 framework/ActiveSync/package.xml                                  |    4 +-
 framework/Argv/locale/pt_BR/LC_MESSAGES/Horde_Argv.mo             |  Bin 1488 -> 1488 bytes
 framework/Argv/locale/pt_BR/LC_MESSAGES/Horde_Argv.po             |   16 +-
 framework/Browser/locale/pt_BR/LC_MESSAGES/Horde_Browser.mo       |  Bin 1333 -> 1333 bytes
 framework/Browser/locale/pt_BR/LC_MESSAGES/Horde_Browser.po       |   14 +-
 framework/Cli/locale/pt_BR/LC_MESSAGES/Horde_Cli.mo               |  Bin 634 -> 727 bytes
 framework/Cli/locale/pt_BR/LC_MESSAGES/Horde_Cli.po               |   20 +-
 framework/Compress/locale/pt_BR/LC_MESSAGES/Horde_Compress.mo     |  Bin 956 -> 956 bytes
 framework/Compress/locale/pt_BR/LC_MESSAGES/Horde_Compress.po     |   10 +-
 framework/Core/js/hordecore.js                                    |   39 +-
 framework/Core/js/smartmobile.js                                  |   26 +-
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php            |    2 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |    4 +
 framework/Core/lib/Horde/Core/Prefs/Ui.php                        |    5 +
 framework/Core/lib/Horde/Themes/Css.php                           |  101 +-
 framework/Core/locale/pt_BR/LC_MESSAGES/Horde_Core.mo             |  Bin 16572 -> 19654 bytes
 framework/Core/locale/pt_BR/LC_MESSAGES/Horde_Core.po             |  703 +-
 framework/Core/package.xml                                        |   24 +-
 framework/Crypt/lib/Horde/Crypt/Pgp.php                           |   28 +-
 framework/Crypt/locale/pt_BR/LC_MESSAGES/Horde_Crypt.mo           |  Bin 7445 -> 7554 bytes
 framework/Crypt/locale/pt_BR/LC_MESSAGES/Horde_Crypt.po           |   93 +-
 framework/Crypt/package.xml                                       |   12 +-
 framework/Css_Parser/doc/Horde/Css/Parser/COPYING                 |  458 +
 framework/Css_Parser/doc/Horde/Css/Parser/EXPAT_LICENSE           |   24 +
 framework/Css_Parser/lib/Horde/Css/Parser.php                     |   72 +
 .../Css_Parser/lib/Sabberworm/CSS/CSSList/AtRuleBlockList.php     |   36 +
 framework/Css_Parser/lib/Sabberworm/CSS/CSSList/CSSBlockList.php  |   78 +
 framework/Css_Parser/lib/Sabberworm/CSS/CSSList/CSSList.php       |   75 +
 framework/Css_Parser/lib/Sabberworm/CSS/CSSList/Document.php      |   87 +
 framework/Css_Parser/lib/Sabberworm/CSS/CSSList/KeyFrame.php      |   48 +
 framework/Css_Parser/lib/Sabberworm/CSS/CSSList/MediaQuery.php    |   32 +
 framework/Css_Parser/lib/Sabberworm/CSS/Parser.php                |  577 +
 .../lib/Sabberworm/CSS/Parsing/UnexpectedTokenException.php       |   28 +
 framework/Css_Parser/lib/Sabberworm/CSS/Property/AtRule.php       |   13 +
 framework/Css_Parser/lib/Sabberworm/CSS/Property/CSSNamespace.php |   48 +
 framework/Css_Parser/lib/Sabberworm/CSS/Property/Charset.php      |   39 +
 framework/Css_Parser/lib/Sabberworm/CSS/Property/Import.php       |   42 +
 framework/Css_Parser/lib/Sabberworm/CSS/Property/Selector.php     |   75 +
 framework/Css_Parser/lib/Sabberworm/CSS/Rule/Rule.php             |  142 +
 framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/AtRuleSet.php     |   36 +
 .../Css_Parser/lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php    |  585 +
 framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/RuleSet.php       |   95 +
 framework/Css_Parser/lib/Sabberworm/CSS/Settings.php              |   52 +
 framework/Css_Parser/lib/Sabberworm/CSS/Value/CSSFunction.php     |   35 +
 framework/Css_Parser/lib/Sabberworm/CSS/Value/Color.php           |   24 +
 framework/Css_Parser/lib/Sabberworm/CSS/Value/PrimitiveValue.php  |    7 +
 framework/Css_Parser/lib/Sabberworm/CSS/Value/RuleValueList.php   |   11 +
 framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php            |   63 +
 framework/Css_Parser/lib/Sabberworm/CSS/Value/String.php          |   27 +
 framework/Css_Parser/lib/Sabberworm/CSS/Value/URL.php             |   26 +
 framework/Css_Parser/lib/Sabberworm/CSS/Value/Value.php           |    8 +
 framework/Css_Parser/lib/Sabberworm/CSS/Value/ValueList.php       |   42 +
 framework/Css_Parser/package.xml                                  |  158 +
 framework/Data/locale/pt_BR/LC_MESSAGES/Horde_Data.mo             |  Bin 1177 -> 1305 bytes
 framework/Data/locale/pt_BR/LC_MESSAGES/Horde_Data.po             |   20 +-
 framework/Date/locale/pt_BR/LC_MESSAGES/Horde_Date.mo             |  Bin 1192 -> 1192 bytes
 framework/Date/locale/pt_BR/LC_MESSAGES/Horde_Date.po             |   26 +-
 framework/Form/locale/pt_BR/LC_MESSAGES/Horde_Form.mo             |  Bin 10910 -> 10967 bytes
 framework/Form/locale/pt_BR/LC_MESSAGES/Horde_Form.po             |  350 +-
 framework/Icalendar/locale/pt_BR/LC_MESSAGES/Horde_Icalendar.mo   |  Bin 503 -> 503 bytes
 framework/Icalendar/locale/pt_BR/LC_MESSAGES/Horde_Icalendar.po   |    4 +-
 framework/Kolab_Cli/locale/pt_BR/LC_MESSAGES/Horde_Kolab_Cli.mo   |  Bin 812 -> 2165 bytes
 framework/Kolab_Cli/locale/pt_BR/LC_MESSAGES/Horde_Kolab_Cli.po   |   22 +-
 .../Kolab_Storage/locale/pt_BR/LC_MESSAGES/Horde_Kolab_Storage.mo |  Bin 7124 -> 2856 bytes
 .../Kolab_Storage/locale/pt_BR/LC_MESSAGES/Horde_Kolab_Storage.po |  280 +-
 framework/Mime/locale/pt_BR/LC_MESSAGES/Horde_Mime.mo             |  Bin 1360 -> 1256 bytes
 framework/Mime/locale/pt_BR/LC_MESSAGES/Horde_Mime.po             |   29 +-
 .../Mime_Viewer/locale/pt_BR/LC_MESSAGES/Horde_Mime_Viewer.mo     |  Bin 1531 -> 1531 bytes
 .../Mime_Viewer/locale/pt_BR/LC_MESSAGES/Horde_Mime_Viewer.po     |    4 +-
 framework/Model/locale/pt_BR/LC_MESSAGES/Horde_Model.mo           |  Bin 6939 -> 6939 bytes
 framework/Model/locale/pt_BR/LC_MESSAGES/Horde_Model.po           |  234 +-
 framework/Nls/locale/pt_BR/LC_MESSAGES/Horde_Nls.mo               |  Bin 14743 -> 14743 bytes
 framework/Nls/locale/pt_BR/LC_MESSAGES/Horde_Nls.po               |    2 +-
 framework/Prefs/locale/pt_BR/LC_MESSAGES/Horde_Prefs.mo           |  Bin 1026 -> 1026 bytes
 framework/Prefs/locale/pt_BR/LC_MESSAGES/Horde_Prefs.po           |    8 +-
 framework/Rpc/locale/pt_BR/LC_MESSAGES/Horde_Rpc.mo               |  Bin 1271 -> 1436 bytes
 framework/Rpc/locale/pt_BR/LC_MESSAGES/Horde_Rpc.po               |    8 +-
 .../locale/pt_BR/LC_MESSAGES/Horde_Service_Facebook.mo            |  Bin 677 -> 677 bytes
 .../locale/pt_BR/LC_MESSAGES/Horde_Service_Facebook.po            |    6 +-
 framework/Stream_Filter/lib/Horde/Stream/Filter/Eol.php           |   28 +-
 .../Text_Filter/locale/pt_BR/LC_MESSAGES/Horde_Text_Filter.mo     |  Bin 475 -> 475 bytes
 .../Text_Filter/locale/pt_BR/LC_MESSAGES/Horde_Text_Filter.po     |    6 +-
 framework/Vfs/locale/pt_BR/LC_MESSAGES/Horde_Vfs.mo               |  Bin 641 -> 641 bytes
 framework/Vfs/locale/pt_BR/LC_MESSAGES/Horde_Vfs.po               |    8 +-
 gollem/locale/pt_BR/LC_MESSAGES/gollem.mo                         |  Bin 72992 -> 71809 bytes
 gollem/locale/pt_BR/LC_MESSAGES/gollem.po                         |  288 +-
 horde/config/hooks.php.dist                                       |   63 +-
 horde/locale/pt_BR/LC_MESSAGES/horde.mo                           |  Bin 64827 -> 64028 bytes
 horde/locale/pt_BR/LC_MESSAGES/horde.po                           | 1562 +-
 horde/templates/prefs/begin.html                                  |    4 +-
 imp/lib/Contents/View.php                                         |   19 +-
 imp/lib/Imap/Tree.php                                             |    7 +-
 imp/lib/Maillog.php                                               |    2 +-
 imp/lib/Mime/Viewer/Html.php                                      |   97 +-
 imp/lib/Mime/Viewer/Pgp.php                                       |   34 +-
 imp/locale/pt_BR/LC_MESSAGES/imp.mo                               |  Bin 183032 -> 176277 bytes
 imp/locale/pt_BR/LC_MESSAGES/imp.po                               | 4563 ++---
 imp/migration/3_imp_maillog_update.php                            |   55 +
 imp/package.xml                                                   |   25 +
 ingo/locale/pt_BR/LC_MESSAGES/ingo.mo                             |  Bin 82364 -> 82678 bytes
 ingo/locale/pt_BR/LC_MESSAGES/ingo.po                             |  527 +-
 kronolith/locale/pt_BR/LC_MESSAGES/kronolith.mo                   |  Bin 125195 -> 123729 bytes
 kronolith/locale/pt_BR/LC_MESSAGES/kronolith.po                   | 1815 +-
 kronolith/workweek.php                                            |    2 +-
 mnemo/locale/pt_BR/LC_MESSAGES/mnemo.mo                           |  Bin 75321 -> 73757 bytes
 mnemo/locale/pt_BR/LC_MESSAGES/mnemo.po                           |  318 +-
 nag/locale/pt_BR/LC_MESSAGES/nag.po                               |  944 +-
 passwd/lib/Basic.php                                              |    2 +-
 passwd/lib/Driver/Procopen.php                                    |    2 +-
 passwd/locale/pt_BR/LC_MESSAGES/passwd.mo                         |  Bin 70609 -> 69878 bytes
 turba/locale/pt_BR/LC_MESSAGES/turba.mo                           |  Bin 95617 -> 94740 bytes
 turba/locale/pt_BR/LC_MESSAGES/turba.po                           |  788 +-
 whups/locale/pt_BR/LC_MESSAGES/whups.mo                           |  Bin 93947 -> 93062 bytes
 wicked/locale/pt_BR/LC_MESSAGES/wicked.mo                         |  Bin 79291 -> 78096 bytes
 wicked/locale/pt_BR/LC_MESSAGES/wicked.po                         |  124 +-
 122 files changed, 9748 insertions(+), 6719 deletions(-)

http://git.horde.org/horde-git/-/commit/17b2e1695378496d1fff4273b2551003d6abdb5f

-----------------------------------------------------------------------

commit 5ba40c28aba53190a0361b75ae3f0691a2ecfe17
Merge: 17b2e16 ea170b7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 20 00:18:31 2013 -0600

    Merge branch 'master' into imp_6_1

 framework/Css_Parser/lib/Sabberworm/CSS/Parser.php      |   48 +++++++--------
 framework/Css_Parser/lib/Sabberworm/CSS/Value/Color.php |   19 ++++++-
 framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php  |    4 +-
 framework/Css_Parser/package.xml                        |    5 ++
 4 files changed, 48 insertions(+), 28 deletions(-)

http://git.horde.org/horde-git/-/commit/5ba40c28aba53190a0361b75ae3f0691a2ecfe17

-----------------------------------------------------------------------

commit 75b92fcb5117c8745f6cfe45b5344cd28624022d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 20 00:23:13 2013 -0600

    Fix migration script
    
    I *think* SQL requires single quotes here instead of double quotes.
    
    At the very least, Postgres was erroring with this message:
    
    SQLSTATE[42703]: Undefined column: 7 ERROR:  column "imp.%" does not
    exist

 imp/migration/3_imp_maillog_update.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/75b92fcb5117c8745f6cfe45b5344cd28624022d

-----------------------------------------------------------------------

commit 9e83070ae376b67f2cb073d3f3b641aa5d698aa0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 10:25:19 2013 -0400

    phpdoc

 imp/lib/Api.php     |    6 +++---
 imp/lib/Maillog.php |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/9e83070ae376b67f2cb073d3f3b641aa5d698aa0

-----------------------------------------------------------------------

commit 8d3d85a312c97e6c75ff3833c6baf7bd9bda1546
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 10:48:01 2013 -0400

    Fix bad merge.

 imp/package.xml |   73 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 64 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/8d3d85a312c97e6c75ff3833c6baf7bd9bda1546

-----------------------------------------------------------------------

commit a1912abd11d5ad196b9d51428d775786af8d78f8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 10:48:14 2013 -0400

    changes

 imp/docs/CHANGES |    1 +
 imp/package.xml  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/a1912abd11d5ad196b9d51428d775786af8d78f8

-----------------------------------------------------------------------

commit 1a1cd4b4e3931176a631a8620de07491ce00dbb1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 12:39:32 2013 -0400

    Fix regression in transparent authentication.
    
    Horde_Registry::isAuthenticated() still expects this to return boolean.

 imp/lib/Auth.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/1a1cd4b4e3931176a631a8620de07491ce00dbb1

-----------------------------------------------------------------------

commit cdddd3b1c69ca0bc9cca0b97881d544a08fb4f99
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 12:55:36 2013 -0400

    Fix property name.

 imp/lib/Factory/Mail.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/cdddd3b1c69ca0bc9cca0b97881d544a08fb4f99

-----------------------------------------------------------------------

commit 0eefc0a48bda0125ee32fea9d40fc254294d864e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 13:24:55 2013 -0400

    phpdoc

 imp/lib/Auth.php |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/0eefc0a48bda0125ee32fea9d40fc254294d864e

-----------------------------------------------------------------------

commit 9cae75f6232f3aecd7cf84bbb23b6d182b1772ef
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 20 13:24:28 2013 -0400

    IMP_Auth::transparent() no longer returns the array of session values.

 imp/lib/Application.php |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/9cae75f6232f3aecd7cf84bbb23b6d182b1772ef

-----------------------------------------------------------------------

commit 02c06e1661154b0e7f2547cb0a4a99c27bc14623
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 20 14:17:57 2013 -0600

    Remove package.xml changelog for 6.1.0

 imp/package.xml |   56 -------------------------------------------------------
 1 files changed, 0 insertions(+), 56 deletions(-)

http://git.horde.org/horde-git/-/commit/02c06e1661154b0e7f2547cb0a4a99c27bc14623

-----------------------------------------------------------------------

commit b8a813f693f5721fcac460f44c3b7c5450f4c953
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 20 15:03:14 2013 -0600

    Fix copy/paste error

 imp/lib/Imap/Config.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/b8a813f693f5721fcac460f44c3b7c5450f4c953

-----------------------------------------------------------------------

commit 489c2f7b96065e6a650555328641ca1976dfc2e9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 20 15:04:12 2013 -0600

    This is already marked global

 imp/lib/Factory/Mail.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/489c2f7b96065e6a650555328641ca1976dfc2e9

-----------------------------------------------------------------------

commit 79cd0aacca17e2188f8b04ad8ddf8823b2a0df82
Merge: 489c2f7 fdd8f53
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Mar 22 01:10:07 2013 -0400

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Mime/Viewer/Html.php
    	imp/migration/3_imp_maillog_update.php

 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php  |    5 +-
 framework/Core/lib/Horde/Themes/Css.php                     |   11 ++-
 framework/Css_Parser/lib/Sabberworm/CSS/Parser.php          |   75 ++++++-----
 framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/RuleSet.php |    2 +-
 framework/Css_Parser/lib/Sabberworm/CSS/Value/Color.php     |   25 ++--
 framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php      |   12 +-
 framework/Css_Parser/package.xml                            |    7 -
 imp/lib/Compose.php                                         |    3 +-
 imp/lib/Contents/View.php                                   |   21 ++-
 imp/lib/Maillog.php                                         |    5 +
 imp/lib/Mime/Viewer/Html.php                                |   55 +++++---
 imp/migration/3_imp_maillog_update.php                      |    4 +-
 kronolith/docs/CHANGES                                      |    3 +
 kronolith/lib/Driver.php                                    |    5 -
 kronolith/lib/Driver/Kolab.php                              |    6 +-
 kronolith/lib/Driver/Sql.php                                |    7 +-
 kronolith/lib/Event.php                                     |    1 +
 kronolith/package.xml                                       |    4 +
 passwd/lib/Basic.php                                        |   12 +-
 19 files changed, 153 insertions(+), 110 deletions(-)

http://git.horde.org/horde-git/-/commit/79cd0aacca17e2188f8b04ad8ddf8823b2a0df82

-----------------------------------------------------------------------

commit 76eed544726c06a630e499e9620ca3b89483682f
Merge: 79cd0aa fe7f7ca
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Mar 22 11:08:01 2013 -0400

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Compose.php

 imp/lib/Compose.php               |   31 ++++++++++++++++---------------
 nag/docs/CHANGES                  |    1 +
 nag/lib/CompleteTask.php          |    4 ++++
 nag/package.xml                   |    2 ++
 nag/templates/list.html.php       |    4 +++-
 nag/templates/list/_task.html.php |    6 +++---
 6 files changed, 29 insertions(+), 19 deletions(-)

http://git.horde.org/horde-git/-/commit/76eed544726c06a630e499e9620ca3b89483682f

-----------------------------------------------------------------------

commit 5a49f1f5e248b677cdd3ed219e123e05370fc7f1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 24 15:44:25 2013 -0600

    [mms] Add PGP keylength configuration option (Request #12099).

 imp/config/conf.xml                        |   16 ++++++++++++++
 imp/docs/CHANGES                           |    1 +
 imp/docs/UPGRADING                         |    4 +++
 imp/lib/Prefs/Special/PgpPrivateKey.php    |   31 +++++++++++++++++++---------
 imp/locale/en/help.xml                     |    7 ------
 imp/package.xml                            |    1 +
 imp/templates/prefs/pgpprivatekey.html.php |   14 ------------
 7 files changed, 43 insertions(+), 31 deletions(-)

http://git.horde.org/horde-git/-/commit/5a49f1f5e248b677cdd3ed219e123e05370fc7f1

-----------------------------------------------------------------------

commit dfeb2a274a554676fb6fa742a21f3f4e58f05614
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 24 19:53:12 2013 -0600

    [mms] Honor forward_default preference in smartmobile view.

 imp/docs/CHANGES                                 |    1 +
 imp/js/smartmobile.js                            |    1 +
 imp/lib/Ajax/Application/Compose.php             |    4 ++++
 imp/lib/Ajax/Application/Handler/Common.php      |    7 ++++++-
 imp/lib/Ajax/Application/Handler/Smartmobile.php |    8 ++++++--
 imp/lib/Compose.php                              |   14 ++++++++++++--
 imp/package.xml                                  |    1 +
 7 files changed, 31 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/dfeb2a274a554676fb6fa742a21f3f4e58f05614

-----------------------------------------------------------------------

commit 79c8bc1d36ed1d0e94df4183baa345b3e140117a
Merge: dfeb2a2 81b68fd
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Mar 25 11:50:01 2013 -0400

    Merge branch 'master' into imp_6_1

 ansel/js/views/common.js                                     |   16 +-
 ansel/lib/View/GalleryRenderer/Base.php                      |    2 +
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php |    1 +
 framework/Core/lib/Horde.php                                 |   19 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php          |   13 +-
 framework/Core/lib/Horde/Core/Factory/Logger.php             |    6 +-
 framework/Core/lib/Horde/Core/Log/Logger.php                 |  175 ++-----
 framework/Core/lib/Horde/Core/Log/Object.php                 |  265 ++++++++++
 framework/Core/package.xml                                   |    8 +-
 framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/RuleSet.php  |    2 +-
 framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php       |    6 +-
 nag/docs/CHANGES                                             |    1 +
 nag/lib/Block/Summary.php                                    |    2 +-
 nag/package.xml                                              |    2 +
 passwd/docs/RELEASE_NOTES                                    |   16 +-
 15 files changed, 363 insertions(+), 171 deletions(-)

http://git.horde.org/horde-git/-/commit/79c8bc1d36ed1d0e94df4183baa345b3e140117a

-----------------------------------------------------------------------

commit 9083b8bf58f4557adcf48e84b51a69faffb2a9af
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 25 12:35:26 2013 -0600

    Fix missing gettext strings

 imp/templates/smartmobile/message.html.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/9083b8bf58f4557adcf48e84b51a69faffb2a9af

-----------------------------------------------------------------------

commit 901a6a1ae698fd44db419d41a975841a60d66780
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 24 23:33:50 2013 -0600

    Rewrite attachment storage backend
    
    This was sort of how I implemented this a couple of months ago, but for
    some reason I took a more integrated approach.  However, this approach
    better allows future/further support of storage backends other than the
    traditional IMP model (i.e. cloud storage).
    
    Further, this approach better abstracts temporary storage vs. linked
    storage. Since both appear the same to the user (the difference isn't
    apparent until the message is sent out), they should be handled the same
    by the code also.  Theoretically allows a backend driver to be written
    that would store attachments differently based on content (e.g. images
    get sent as linked attachment and saved in a web-accessible photo
    application).
    
    Instead of a hook, this can be configured by changing the $classAtc and
    $classLink variables in IMP_Factory_ComposeAtc at run-time; this is a
    bit too specialized for a hook, since it requires some knowledge of the
    attachment storage classes before it can be implemented.

 imp/config/hooks.php.dist                            |   20 --
 imp/docs/UPGRADING                                   |    1 -
 imp/lib/Application.php                              |    1 -
 imp/lib/Compose.php                                  |    4 +-
 imp/lib/Compose/Attachment.php                       |  111 +++-----
 imp/lib/Compose/Attachment/Linked.php                |   41 +++
 imp/lib/Compose/Attachment/Linked/Metadata.php       |   93 ++++++
 imp/lib/Compose/Attachment/Storage.php               |  110 +++++++
 imp/lib/Compose/Attachment/Storage/Vfs.php           |  104 +++++++
 imp/lib/Compose/Attachment/Storage/VfsLinked.php     |  176 ++++++++++++
 imp/lib/Compose/LinkedAttachment.php                 |  266 ++++--------------
 imp/lib/Factory/ComposeAtc.php                       |   82 ++++++
 imp/lib/Factory/ComposeVfs.php                       |   35 ---
 imp/lib/LoginTasks/SystemTask/GarbageCollection.php  |   14 +-
 imp/lib/LoginTasks/Task/DeleteAttachmentsMonthly.php |   14 +-
 15 files changed, 724 insertions(+), 348 deletions(-)
 create mode 100644 imp/lib/Compose/Attachment/Linked.php
 create mode 100644 imp/lib/Compose/Attachment/Linked/Metadata.php
 create mode 100644 imp/lib/Compose/Attachment/Storage.php
 create mode 100644 imp/lib/Compose/Attachment/Storage/Vfs.php
 create mode 100644 imp/lib/Compose/Attachment/Storage/VfsLinked.php
 create mode 100644 imp/lib/Factory/ComposeAtc.php
 delete mode 100644 imp/lib/Factory/ComposeVfs.php

http://git.horde.org/horde-git/-/commit/901a6a1ae698fd44db419d41a975841a60d66780

-----------------------------------------------------------------------

commit 3afec365b207362ab425d6fbaa41cf2075eeba45
Merge: 901a6a1 116e002
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 25 18:03:39 2013 -0600

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/LoginTasks/SystemTask/Upgrade.php
    	imp/package.xml

 imp/config/prefs.php                      |    4 ++--
 imp/docs/CHANGES                          |    7 +++++++
 imp/js/dimpbase.js                        |    9 ++++-----
 imp/lib/Ajax/Application/ListMessages.php |    2 +-
 imp/lib/Dynamic/Mailbox.php               |    6 +++++-
 imp/lib/LoginTasks/SystemTask/Upgrade.php |   17 +++++++++++++++++
 imp/lib/Prefs/Sort/Sortpref.php           |    2 +-
 imp/package.xml                           |    2 ++
 imp/rss.php                               |    2 +-
 9 files changed, 40 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/3afec365b207362ab425d6fbaa41cf2075eeba45

-----------------------------------------------------------------------

commit 79972c5c524d83aa103f7ba923b9cfc584a00581
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 25 20:47:20 2013 -0600

    [mms] Rename 'compose_attach' hook as 'compose_attachment'.
    
    Due to the way we build attachment data, the old compose_attach is
    worthless.  First, we have moved MIME detection back into IMP's core
    code. Also, we need to run the hook for any attachment, not just
    uploaded attachment (since we now allow things like browser data URL
    insertion).
    
    It is best to simply start all over with a new hook, so thus the total
    renaming. Bonus, besides above, is that we expose the actual Attachment
    object so ANYTHING about the attachment can be altered (data, MIME part
    information) and we still keep the efficiencies of allowing access to
    the already existing temporary file.

 imp/config/hooks.php.dist      |   34 +++++-----------------------------
 imp/docs/CHANGES               |    1 +
 imp/docs/UPGRADING             |   19 ++++++++++++-------
 imp/lib/Compose.php            |    9 ++++-----
 imp/lib/Compose/Attachment.php |   28 ++++++++++++++--------------
 imp/package.xml                |    1 +
 6 files changed, 37 insertions(+), 55 deletions(-)

http://git.horde.org/horde-git/-/commit/79972c5c524d83aa103f7ba923b9cfc584a00581

-----------------------------------------------------------------------

commit 7b4dbba7da4da7ba8a024f575047a8f78084be58
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 25 20:52:19 2013 -0600

    Update filelist

 imp/package.xml |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/7b4dbba7da4da7ba8a024f575047a8f78084be58

-----------------------------------------------------------------------

commit 0182d2253b2d8c99a3cecc948e7330909ac76aa3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 25 22:52:20 2013 -0600

    Remove unused code

 imp/lib/Mime/Viewer/Html.php |   50 +++++++----------------------------------
 1 files changed, 9 insertions(+), 41 deletions(-)

http://git.horde.org/horde-git/-/commit/0182d2253b2d8c99a3cecc948e7330909ac76aa3

-----------------------------------------------------------------------

commit b6c1823e9c6a945c585bc89943c92291138c7e5a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 25 23:14:52 2013 -0600

    Only filter in textual data

 imp/lib/Mime/Viewer/Html.php |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/b6c1823e9c6a945c585bc89943c92291138c7e5a

-----------------------------------------------------------------------

commit d55fcad8e73062d201a6e4083032c3a84c006fad
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 25 23:23:55 2013 -0600

    Don't need Horde_String::lower() here - we are only matching ASCII text so if this are indeed some crazy multiibyte string, it wouldn't match anyway

 imp/lib/Mime/Viewer/Html.php |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/d55fcad8e73062d201a6e4083032c3a84c006fad

-----------------------------------------------------------------------

commit 84416cd882b1aedd6addd2bad4990e6eb362dbb3
Author: Jan Schneider <jan at horde.org>
Date:   Tue Mar 26 08:32:44 2013 +0100

    Revert "Don't need Horde_String::lower() here - we are only matching ASCII text so if this are indeed some crazy multiibyte string, it wouldn't match anyway"
    
    This reverts commit d55fcad8e73062d201a6e4083032c3a84c006fad.
    
    *Those* Horde_String methods are not for dealing with multibyte strings, but
     for working around PHP bugs when using certain locales.

 imp/lib/Mime/Viewer/Html.php |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/84416cd882b1aedd6addd2bad4990e6eb362dbb3

-----------------------------------------------------------------------

commit 9160cf9f61b65760cbe5bad4a70c85e409f40ca6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 26 12:40:54 2013 -0600

    Need to document this BC API break

 imp/docs/UPGRADING |    9 +++++++++
 imp/lib/Api.php    |    6 ++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/9160cf9f61b65760cbe5bad4a70c85e409f40ca6

-----------------------------------------------------------------------

commit 274eb8223c9ab7020ab26f6723ba48ed28583905
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 26 12:44:12 2013 -0600

    There is no guarantee that maillog is available

 imp/lib/Api.php |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/274eb8223c9ab7020ab26f6723ba48ed28583905

-----------------------------------------------------------------------

commit 22a31634eb817804cdaffafa3cc7d1c85224e849
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 26 13:25:41 2013 -0600

    callAction() has been moved to Horde_Core 2.5.0

 imp/lib/Ajax/Application.php |   18 ------------------
 imp/package.xml              |    2 +-
 2 files changed, 1 insertions(+), 19 deletions(-)

http://git.horde.org/horde-git/-/commit/22a31634eb817804cdaffafa3cc7d1c85224e849

-----------------------------------------------------------------------

commit 82050463803b833b5011b89c9310087b21c02f17
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 26 13:41:25 2013 -0600

    Move draft actions to a separate handler

 imp/lib/Ajax/Application.php                 |    1 +
 imp/lib/Ajax/Application/Handler/Draft.php   |  137 ++++++++++++++++++++++++++
 imp/lib/Ajax/Application/Handler/Dynamic.php |  101 -------------------
 imp/package.xml                              |    4 +-
 4 files changed, 141 insertions(+), 102 deletions(-)
 create mode 100644 imp/lib/Ajax/Application/Handler/Draft.php

http://git.horde.org/horde-git/-/commit/82050463803b833b5011b89c9310087b21c02f17

-----------------------------------------------------------------------

commit ee44efa6cb7b852224cffb94f0dd6c8059126f59
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 26 13:50:06 2013 -0600

    [mms] Add saving compose drafts in smartmobile view.

 imp/docs/CHANGES                           |    1 +
 imp/js/smartmobile.js                      |    5 ++++-
 imp/lib/Ajax/Application.php               |    6 +++++-
 imp/lib/Smartmobile.php                    |    5 +++++
 imp/package.xml                            |    1 +
 imp/templates/smartmobile/compose.html.php |    3 +++
 6 files changed, 19 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/ee44efa6cb7b852224cffb94f0dd6c8059126f59

-----------------------------------------------------------------------

commit 435864abfb9d045707b6e9a04e72eecd9803a8b4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 26 13:56:57 2013 -0600

    Fix parsing compose cacheid in smartmobile view

 imp/js/smartmobile.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/435864abfb9d045707b6e9a04e72eecd9803a8b4

-----------------------------------------------------------------------

commit aec0ed9c56bd8be8d066af7a2af028aa1c359517
Merge: 435864a cb3ff67
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 26 13:59:23 2013 -0600

    Merge branch 'master' into imp_6_1

 framework/Core/lib/Horde/Core/Ajax/Application.php |   18 ++++++++++++++++++
 framework/Core/lib/Horde/Core/Db/Migration.php     |    4 ++++
 framework/Core/package.xml                         |    2 ++
 framework/Util/lib/Horde/Domhtml.php               |    4 ++--
 4 files changed, 26 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/aec0ed9c56bd8be8d066af7a2af028aa1c359517

-----------------------------------------------------------------------

commit ead01da3fe104844553bb7ccdf4ac50512a3d62f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 26 20:06:17 2013 -0600

    phpdoc

 imp/lib/Compose.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/ead01da3fe104844553bb7ccdf4ac50512a3d62f

-----------------------------------------------------------------------

commit 69537beaacaea95f8152d30fc20486edabe01908
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Mar 26 20:58:51 2013 -0600

    Get rid of IMP::bareAddress()
    
    Really... there is very little reason to carry ANY address around as a
    string anymore.  We should be passing address objects around and
    converting to string representation only when needed.

 imp/bin/imp-bounce-spam                           |    6 ++--
 imp/lib/Ajax/Application/Handler/ImageUnblock.php |    8 +++---
 imp/lib/Ajax/Imple/ItipRequest.php                |    3 +-
 imp/lib/Compose.php                               |   29 ++++++++++++++------
 imp/lib/Filter.php                                |    6 ++--
 imp/lib/IMP.php                                   |   17 ------------
 imp/lib/Mime/Viewer/Itip.php                      |    7 +++--
 imp/lib/Mime/Viewer/Pgp.php                       |    9 +++---
 8 files changed, 41 insertions(+), 44 deletions(-)

http://git.horde.org/horde-git/-/commit/69537beaacaea95f8152d30fc20486edabe01908

-----------------------------------------------------------------------

commit d704918595bd26308673f4948093f70619072e26
Merge: 69537be f1c8458
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 27 22:33:55 2013 -0600

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/js/compose-dimp.js
    	imp/lib/LoginTasks/SystemTask/Upgrade.php
    	imp/package.xml

 framework/Core/js/jquery.mobile/jquery.js             | 3440 +++++++++--------
 framework/Core/js/jquery.mobile/jquery.min.js         |    4 +-
 framework/Core/js/jquery.mobile/jquery.mobile.js      |  373 ++-
 framework/Core/js/jquery.mobile/jquery.mobile.min.css |    4 +-
 framework/Core/js/jquery.mobile/jquery.mobile.min.js  |    4 +-
 framework/Core/lib/Horde/PageOutput.php               |    1 -
 framework/Core/package.xml                            |    4 +
 framework/Imap_Client/package.xml                     |   25 +-
 framework/Mime/doc/Horde/Mime/UPGRADING               |   11 +
 framework/Mime/lib/Horde/Mime.php                     |   83 +-
 framework/Mime/lib/Horde/Mime/Part.php                |    2 +-
 framework/Mime/lib/Horde/Mime/Translation.php         |   14 +-
 framework/Mime/lib/Horde/Mime/mime.mapping.php        |    8 +-
 framework/Mime/package.xml                            |   22 +-
 framework/Mime/test/Horde/Mime/MimeTest.php           |   45 +
 framework/lz4/package.xml                             |   17 +-
 imp/config/prefs.php                                  |    6 +-
 imp/docs/CHANGES                                      |    3 +-
 imp/js/compose-dimp.js                                |    1 +
 imp/js/dimpbase.js                                    |    2 +-
 imp/lib/Contents.php                                  |    2 +-
 imp/lib/Dynamic/Mailbox.php                           |    9 +-
 imp/lib/IMP.php                                       |    2 +-
 imp/lib/LoginTasks/SystemTask/Upgrade.php             |   17 -
 imp/lib/Mime/Viewer/Html.php                          |    2 +-
 imp/lib/Mime/Viewer/Pgp.php                           |    6 +-
 imp/package.xml                                       |    2 +-
 imp/rss.php                                           |    2 +-
 28 files changed, 2212 insertions(+), 1899 deletions(-)

http://git.horde.org/horde-git/-/commit/d704918595bd26308673f4948093f70619072e26

-----------------------------------------------------------------------

commit 3982abd371203ad185f69225efc167f5c6d83c86
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Mar 28 00:06:16 2013 -0600

    More succinct

 imp/smartmobile.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/3982abd371203ad185f69225efc167f5c6d83c86

-----------------------------------------------------------------------

commit fb4ac49a813a4910e8add007b0c46b58d78ba7dd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Mar 28 00:43:24 2013 -0600

    Move compose link related methods from IMP to IMP_Compose_Link
    
    Sucks that class member access on instantiation is only supported as of
    PHP 5.4.  That would make this code even more succinct and easier to
    read.

 imp/config/prefs.php         |    3 +-
 imp/lib/Api.php              |    6 ++-
 imp/lib/Application.php      |    6 +-
 imp/lib/Basic/Compose.php    |   10 ++--
 imp/lib/Basic/Mailbox.php    |   12 ++-
 imp/lib/Basic/Message.php    |   40 ++++++-----
 imp/lib/Compose/Link.php     |  152 ++++++++++++++++++++++++++++++++++++++++++
 imp/lib/Dynamic/Compose.php  |   10 ++--
 imp/lib/IMP.php              |  144 ---------------------------------------
 imp/lib/Message/Ui.php       |    6 +-
 imp/lib/Mime/Viewer/Html.php |    3 +-
 imp/lib/Minimal/Mailbox.php  |    3 +-
 imp/lib/Minimal/Message.php  |   15 +++--
 imp/package.xml              |    4 +-
 14 files changed, 224 insertions(+), 190 deletions(-)
 create mode 100644 imp/lib/Compose/Link.php

http://git.horde.org/horde-git/-/commit/fb4ac49a813a4910e8add007b0c46b58d78ba7dd

-----------------------------------------------------------------------

commit 7645610db382478a041dd474223298974ddabb3f
Merge: fb4ac49 448a39e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Mar 28 15:29:55 2013 -0600

    Merge branch 'master' into imp_6_1

 framework/Core/lib/Horde/Core/Ajax/Application.php   |    5 +--
 framework/Core/lib/Horde/Core/Factory/Ajax.php       |    5 ++-
 framework/Core/lib/Horde/Themes/Css.php              |   32 +++++++++--------
 framework/Core/package.xml                           |    2 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php |    7 +---
 framework/Util/lib/Horde/Domhtml.php                 |    2 +-
 framework/Util/package.xml                           |    4 +-
 horde/docs/CHANGES                                   |    2 +
 horde/package.xml                                    |    2 +
 horde/templates/portal/smartmobile.inc               |    2 +-
 nag/docs/CHANGES                                     |    6 ++-
 nag/lib/Block/Summary.php                            |   16 ++++----
 nag/lib/Driver.php                                   |    3 +-
 nag/lib/Driver/Sql.php                               |    5 ++-
 nag/package.xml                                      |    6 ++-
 15 files changed, 56 insertions(+), 43 deletions(-)

http://git.horde.org/horde-git/-/commit/7645610db382478a041dd474223298974ddabb3f

-----------------------------------------------------------------------

commit 6ae28ccc2f12ff3ace3aeb60c282be297b37d13d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Mar 28 15:34:33 2013 -0600

    Get rid of compose header
    
    It is duplicative of window header and takes up substantial screen real
    estate.

 imp/templates/dynamic/compose.html.php |    4 ----
 imp/themes/default/dynamic/screen.css  |    9 ---------
 2 files changed, 0 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/6ae28ccc2f12ff3ace3aeb60c282be297b37d13d

-----------------------------------------------------------------------

commit 6d73b1702f241922f186a03ef12a1ad0e6fa850f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 29 12:03:27 2013 -0600

    IMP_Compose#replyMessage() now returns address objects instead of strings.

 imp/lib/Ajax/Application/Compose.php        |    2 +-
 imp/lib/Ajax/Application/Handler/Common.php |    2 +-
 imp/lib/Basic/Compose.php                   |    4 +-
 imp/lib/Compose.php                         |   79 ++++++++++++++-------------
 imp/lib/Dynamic/Compose.php                 |    2 +-
 imp/lib/Minimal/Compose.php                 |    2 +-
 6 files changed, 48 insertions(+), 43 deletions(-)

http://git.horde.org/horde-git/-/commit/6d73b1702f241922f186a03ef12a1ad0e6fa850f

-----------------------------------------------------------------------

commit 587f2e358efc520e790683c3413fc09a980c1e45
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 29 13:43:36 2013 -0600

    IMP::parseAddressList() now supports Horde_Mail_Rfc822_List objects natively

 imp/lib/IMP.php |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/587f2e358efc520e790683c3413fc09a980c1e45

-----------------------------------------------------------------------

commit c2997eb090b74383f08a6dbedf300648facd791f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 29 14:24:15 2013 -0600

    phpdoc

 imp/lib/Compose.php |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

http://git.horde.org/horde-git/-/commit/c2997eb090b74383f08a6dbedf300648facd791f

-----------------------------------------------------------------------

commit 397e36e55d085ab3c485c325df747cd2eb36b8aa
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 29 14:35:59 2013 -0600

    Don't return headers array from IMP_Compose#forwardMessage()

 imp/lib/Basic/Compose.php   |    4 ++--
 imp/lib/Compose.php         |   35 ++++++++++++++++-------------------
 imp/lib/Dynamic/Compose.php |    2 +-
 imp/lib/Minimal/Compose.php |    2 +-
 4 files changed, 20 insertions(+), 23 deletions(-)

http://git.horde.org/horde-git/-/commit/397e36e55d085ab3c485c325df747cd2eb36b8aa

-----------------------------------------------------------------------

commit f4b42d2403b96c40dbb2c35eb17653697b75260a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 29 14:40:32 2013 -0600

    Draft resuming methods no longer return headers array

 imp/lib/Basic/Compose.php   |   35 +++++++++++++++++++++++++++++++----
 imp/lib/Compose.php         |   27 +++++++++++++++++----------
 imp/lib/Minimal/Compose.php |   33 ++++++++++++++++++++++++++++++---
 3 files changed, 78 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/f4b42d2403b96c40dbb2c35eb17653697b75260a

-----------------------------------------------------------------------

commit f9c29389237704bd89cfc8a5777cf5b89677cdd7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 29 18:05:45 2013 -0600

    Pass reply addresses to dynamic views as an array instead of a string

 imp/js/compose-dimp.js                      |   22 +++++++++++-----------
 imp/js/smartmobile.js                       |    6 +++---
 imp/lib/Ajax/Application/Compose.php        |   15 +++++++++++----
 imp/lib/Ajax/Application/Handler/Common.php |   17 ++++++++---------
 4 files changed, 33 insertions(+), 27 deletions(-)

http://git.horde.org/horde-git/-/commit/f9c29389237704bd89cfc8a5777cf5b89677cdd7

-----------------------------------------------------------------------

commit cdc314203d333c02ea4ef5816b04eb1252456b08
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 29 21:12:41 2013 -0600

    [mms] Improved autocompleter in smartmobile compose view.
    
    Addresses are now split and shown in separate UI buttons to allow for
    easier removal of addresses.

 imp/docs/CHANGES                           |    1 +
 imp/js/smartmobile.js                      |   46 +++++++++++++++++++++++++---
 imp/package.xml                            |    1 +
 imp/templates/smartmobile/compose.html.php |    6 ++-
 imp/themes/default/smartmobile/screen.css  |    6 ++++
 5 files changed, 53 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/cdc314203d333c02ea4ef5816b04eb1252456b08

-----------------------------------------------------------------------

commit 22180cc9b3dcf0dd712b373725fa2772922008bd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 29 23:55:10 2013 -0600

    This is no longer used

 imp/js/dimpcore.js |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/22180cc9b3dcf0dd712b373725fa2772922008bd

-----------------------------------------------------------------------

commit 2d28e9ef8b136f4fac2662250cd88b2a47206c1f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 00:09:59 2013 -0600

    Don't output summary information when viewing in smartmobile view

 imp/lib/Ajax/Application/ShowMessage.php  |   22 +++++++++++++++-------
 imp/themes/default/smartmobile/screen.css |    2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/2d28e9ef8b136f4fac2662250cd88b2a47206c1f

-----------------------------------------------------------------------

commit bff4789e8b597ff6d4de1dd6e257f587feb8077d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 00:17:00 2013 -0600

    Allow MIME status objects to identify which views to be displayed in.

 imp/lib/Contents.php                      |   15 +++++++++++----
 imp/lib/Mime/Status.php                   |   11 +++++++++++
 imp/themes/default/smartmobile/screen.css |    3 ---
 3 files changed, 22 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/bff4789e8b597ff6d4de1dd6e257f587feb8077d

-----------------------------------------------------------------------

commit 9874ac75f27e9e472bb57786e5f457218f86eb2d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 01:19:58 2013 -0600

    [mms] Add HTML image/style blocking to smartmobile view.

 imp/docs/CHANGES             |    1 +
 imp/js/smartmobile.js        |   59 ++++++++++++++++++++++++
 imp/lib/Mime/Status.php      |   40 +++++++++++-----
 imp/lib/Mime/Viewer/Html.php |  101 +++++++++++++++++++++++++++--------------
 imp/package.xml              |    1 +
 5 files changed, 154 insertions(+), 48 deletions(-)

http://git.horde.org/horde-git/-/commit/9874ac75f27e9e472bb57786e5f457218f86eb2d

-----------------------------------------------------------------------

commit 309ee28e1044e822d1513af384a407946adc9389
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 01:33:57 2013 -0600

    Theming for image view button

 imp/lib/Mime/Viewer/Html.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/309ee28e1044e822d1513af384a407946adc9389

-----------------------------------------------------------------------

commit a6840c8e788f5573453df9a059ce3901f55723c2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 01:37:52 2013 -0600

    Better screen positioning on message open

 imp/js/smartmobile.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/a6840c8e788f5573453df9a059ce3901f55723c2

-----------------------------------------------------------------------

commit b4d4a7eed93b49c3145a3cae7224ca3fa8ae78df
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 01:42:19 2013 -0600

    Fix displaying size in the attachment listing

 imp/lib/Ajax/Application/ShowMessage.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/b4d4a7eed93b49c3145a3cae7224ca3fa8ae78df

-----------------------------------------------------------------------

commit f139b48fc7b282f90217739c732140ba5182b6fa
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 01:54:53 2013 -0600

    Improvements/fixes to resizing code in smartmobile HTML image blocking code

 imp/js/smartmobile.js |   20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)

http://git.horde.org/horde-git/-/commit/f139b48fc7b282f90217739c732140ba5182b6fa

-----------------------------------------------------------------------

commit 0c98299aec42445e16ee22a7608de17fd2f67def
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 01:56:18 2013 -0600

    Use one() here

 imp/js/smartmobile.js |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/0c98299aec42445e16ee22a7608de17fd2f67def

-----------------------------------------------------------------------

commit 5f0907bc88a5099e560768adfbb5ed02440a0166
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 02:08:30 2013 -0600

    simplify

 imp/js/smartmobile.js |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/5f0907bc88a5099e560768adfbb5ed02440a0166

-----------------------------------------------------------------------

commit b35ea3719ad9a0474f869a39d13b35e27c5d1a3f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 23:30:05 2013 -0600

    Fix direct loading of compose page

 imp/js/smartmobile.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/b35ea3719ad9a0474f869a39d13b35e27c5d1a3f

-----------------------------------------------------------------------

commit b79bb8180032d067a4e59d2a6fcc031a4e0102b6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 30 23:31:46 2013 -0600

    Highlight email addresses with a different theme

 imp/js/smartmobile.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/b79bb8180032d067a4e59d2a6fcc031a4e0102b6

-----------------------------------------------------------------------

commit e15cce053ff529062cc19646afb3171bcb8d65c3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 31 00:05:16 2013 -0600

    Improved image unblocking code in basic and dynamic view

 imp/js/imp.js |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

http://git.horde.org/horde-git/-/commit/e15cce053ff529062cc19646afb3171bcb8d65c3

-----------------------------------------------------------------------

commit dfa663fcd2449becf639bcf964ab4f334b6961ec
Merge: e15cce0 ae3c370
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Mar 31 13:10:33 2013 -0400

    Merge branch 'master' into imp_6_1

 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |    2 +-
 framework/Imap_Client/package.xml                      |   21 +++++++++++++---
 framework/Mime/lib/Horde/Mime/Part.php                 |    3 +-
 framework/Mime/package.xml                             |    2 +
 4 files changed, 22 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/dfa663fcd2449becf639bcf964ab4f334b6961ec

-----------------------------------------------------------------------

commit be45e3770118d27d603a48cad5f6918994539f20
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Mar 31 13:24:47 2013 -0400

    Fix running IMP's GarbageCollection login task.

 imp/lib/LoginTasks/SystemTask/GarbageCollection.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/be45e3770118d27d603a48cad5f6918994539f20

-----------------------------------------------------------------------

commit 5b9b6010662c7fed182145e92e1ea9aec91f0d4c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Mar 31 16:33:57 2013 -0400

    Add missing closing configswitch tag.

 imp/config/conf.xml |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/5b9b6010662c7fed182145e92e1ea9aec91f0d4c

-----------------------------------------------------------------------

commit 593d5b4bcfb12e612fc4b441a59aab634c5fcbc1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 31 00:13:11 2013 -0600

    phpdoc

 framework/Mail/lib/Horde/Mail/Transport.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/593d5b4bcfb12e612fc4b441a59aab634c5fcbc1

-----------------------------------------------------------------------

commit e217d342d0bd7ccb41f1bd6d836561bd5ffa665e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 31 19:40:58 2013 -0600

    This is an optional argument

 imp/lib/Compose/Link.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/e217d342d0bd7ccb41f1bd6d836561bd5ffa665e

-----------------------------------------------------------------------

commit d6b478977a77713eb634a6995e7639da46210fa9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 31 19:41:38 2013 -0600

    ws

 imp/config/conf.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/d6b478977a77713eb634a6995e7639da46210fa9

-----------------------------------------------------------------------

commit 9ed4e9f9d42498240a2889783c30a6f5fe586968
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 31 19:52:07 2013 -0600

    Fix replying to a list

 imp/lib/Compose.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/9ed4e9f9d42498240a2889783c30a6f5fe586968

-----------------------------------------------------------------------

commit d250853a25b6c12d1c9c1b903c0658bd700a06ec
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 31 23:50:12 2013 -0600

    Fix draft resuming

 imp/lib/Compose.php |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/d250853a25b6c12d1c9c1b903c0658bd700a06ec

-----------------------------------------------------------------------

commit 4ca76a81631bf9b75725975fb44059affdf8af2a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 31 23:54:19 2013 -0600

    Move discard actions into popup menu

 imp/js/smartmobile.js                      |   35 ++++++++++++++++++++++++----
 imp/templates/smartmobile/compose.html.php |   18 ++++++++++++--
 2 files changed, 45 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/4ca76a81631bf9b75725975fb44059affdf8af2a

-----------------------------------------------------------------------

commit c286c7dbecfa63a638cb3df61865a4e4a9d8fa5f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 00:02:28 2013 -0600

    Better generation of message popup menu

 imp/js/smartmobile.js                      |   19 +++-----
 imp/templates/smartmobile/message.html.php |   64 +++++++++++++--------------
 2 files changed, 38 insertions(+), 45 deletions(-)

http://git.horde.org/horde-git/-/commit/c286c7dbecfa63a638cb3df61865a4e4a9d8fa5f

-----------------------------------------------------------------------

commit 1f548f5e56e16c9527637413aab20a4d858f297c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 00:32:57 2013 -0600

    PATH_INFO is not specifically needed by IMP

 imp/docs/INSTALL |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/1f548f5e56e16c9527637413aab20a4d858f297c

-----------------------------------------------------------------------

commit 3dc49a0aa8b0011729b62e0e69a947de7d358bfc
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 00:40:52 2013 -0600

    phpdoc

 imp/test/Imp/Autoload.php                  |    1 +
 imp/test/Imp/Stub/HtmlViewer.php           |    4 ++--
 imp/test/Imp/Unit/ComposeTest.php          |    5 +++--
 imp/test/Imp/Unit/MboxParseTest.php        |    1 +
 imp/test/Imp/Unit/Mime/Viewer/HtmlTest.php |    5 +++--
 imp/test/Imp/Unit/Mime/Viewer/ItipTest.php |    4 ++--
 imp/test/Imp/Unit/QuotaTest.php            |    3 ++-
 imp/test/Imp/Unit/ReferencesTest.php       |    1 +
 8 files changed, 15 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/3dc49a0aa8b0011729b62e0e69a947de7d358bfc

-----------------------------------------------------------------------

commit a78d17670649028f1ed4b0643bba6027bbe92224
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 00:43:38 2013 -0600

    Fix test

 imp/test/Imp/Unit/Mime/Viewer/HtmlTest.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/a78d17670649028f1ed4b0643bba6027bbe92224

-----------------------------------------------------------------------

commit a4501f79ab5c02c412c0ff95cc895d0a082a84fb
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 01:28:48 2013 -0600

    Add clear sort to dynamic view

 imp/js/dimpbase.js          |    8 ++++++++
 imp/lib/Dynamic/Mailbox.php |    4 ++++
 2 files changed, 12 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/a4501f79ab5c02c412c0ff95cc895d0a082a84fb

-----------------------------------------------------------------------

commit b56aa5c1fd0f07efc6efcac95b22a7bc0221931b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 01:30:44 2013 -0600

    addPopdownButton is redundant

 imp/js/dimpbase.js     |   10 +++++-----
 imp/js/dimpcore.js     |    6 ------
 imp/js/message-dimp.js |    4 ++--
 3 files changed, 7 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/b56aa5c1fd0f07efc6efcac95b22a7bc0221931b

-----------------------------------------------------------------------

commit f222dba3875abeb2f88d63b72a3958de62722c2e
Merge: b56aa5c 918142e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 16:16:40 2013 -0600

    Merge branch 'master' into imp_6_1

 framework/Core/js/jquery.mobile/plugins/form.js      | 1147 ++++++++++++++++++
 framework/Core/js/smartmobile.js                     |   19 +-
 framework/Core/lib/Horde/Themes/Css.php              |   11 +-
 framework/Core/package.xml                           |   10 +-
 framework/Mail/lib/Horde/Mail/Transport.php          |   31 +
 framework/Mail/lib/Horde/Mail/Transport/Mail.php     |   31 +-
 framework/Mail/lib/Horde/Mail/Transport/Mock.php     |   28 +-
 framework/Mail/lib/Horde/Mail/Transport/Null.php     |   22 +-
 framework/Mail/lib/Horde/Mail/Transport/Sendmail.php |   43 +-
 framework/Mail/lib/Horde/Mail/Transport/Smtp.php     |   40 +-
 framework/Mail/lib/Horde/Mail/Transport/Smtpmx.php   |   36 +-
 framework/Mail/test/Horde/Mail/SendTest.php          |   34 +-
 12 files changed, 1256 insertions(+), 196 deletions(-)

http://git.horde.org/horde-git/-/commit/f222dba3875abeb2f88d63b72a3958de62722c2e

-----------------------------------------------------------------------

commit 09195686fdb4975cabc0137e3577a29f8c23d2b8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 13:13:17 2013 -0600

    Address information is not sent in forward requests

 imp/js/smartmobile.js |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/09195686fdb4975cabc0137e3577a29f8c23d2b8

-----------------------------------------------------------------------

commit 053353d07a4562f689b1f1017571979ab6ef32a8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 13:32:00 2013 -0600

    Attachment size now returned formatted in AJAX task

 imp/js/compose-dimp.js |    4 ++--
 imp/lib/Ajax/Queue.php |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/053353d07a4562f689b1f1017571979ab6ef32a8

-----------------------------------------------------------------------

commit 71d488755e1a30141121f1a2ffc7e5e21c547656
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 13:32:20 2013 -0600

    Show compose attachment information in smartmobile view

 imp/js/smartmobile.js                      |   42 ++++++++++++++++++++++++++++
 imp/lib/Smartmobile.php                    |    7 ++++-
 imp/templates/smartmobile/compose.html.php |   21 +++++++++++--
 imp/themes/default/smartmobile/screen.css  |    3 ++
 4 files changed, 68 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/71d488755e1a30141121f1a2ffc7e5e21c547656

-----------------------------------------------------------------------

commit 506431ad49030f713ecd25e371e964392096b908
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 16:40:15 2013 -0600

    [mms] Add attachment upload capability to smartmobile compose page.

 imp/docs/CHANGES                                   |    1 +
 imp/js/ckeditor/pasteattachment.js                 |    6 +-
 imp/js/smartmobile.js                              |   29 ++++--
 imp/lib/Ajax/Application.php                       |    4 +-
 imp/lib/Ajax/Application/Handler/ComposeAttach.php |   97 ++++++++++++++++++++
 imp/lib/Ajax/Application/Handler/Dynamic.php       |   71 --------------
 imp/lib/Smartmobile.php                            |    3 +
 imp/package.xml                                    |    5 +-
 imp/templates/smartmobile/compose.html.php         |    6 +
 9 files changed, 139 insertions(+), 83 deletions(-)
 create mode 100644 imp/lib/Ajax/Application/Handler/ComposeAttach.php

http://git.horde.org/horde-git/-/commit/506431ad49030f713ecd25e371e964392096b908

-----------------------------------------------------------------------

commit ac3c7d060a6593ba94d40ec36b0afb0f4b72953f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 18:45:58 2013 -0600

    Fix hiding attachment upload if limit has been reached

 imp/js/smartmobile.js                      |    2 +-
 imp/templates/smartmobile/compose.html.php |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/ac3c7d060a6593ba94d40ec36b0afb0f4b72953f

-----------------------------------------------------------------------

commit 5df28625618ee8f3ab1e53a1d38092e072a3fbc8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 18:46:38 2013 -0600

    Hide browser file input widget

 imp/js/smartmobile.js                      |    8 +++++---
 imp/templates/smartmobile/compose.html.php |    5 ++++-
 imp/themes/default/smartmobile/screen.css  |   14 ++++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/5df28625618ee8f3ab1e53a1d38092e072a3fbc8

-----------------------------------------------------------------------

commit c0025b336e0059d00ffd941feb997b6fdc55e932
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 21:56:04 2013 -0600

    [mms] Hide browser generated file input widget for attachment upload in dynamic compose page.

 imp/docs/CHANGES                       |    2 ++
 imp/js/compose-dimp.js                 |   15 ++++-----------
 imp/package.xml                        |    1 +
 imp/templates/dynamic/compose.html.php |    1 +
 imp/themes/default/dynamic/screen.css  |   21 ++++++++++++++++++++-
 5 files changed, 28 insertions(+), 12 deletions(-)

http://git.horde.org/horde-git/-/commit/c0025b336e0059d00ffd941feb997b6fdc55e932

-----------------------------------------------------------------------

commit 68fd8dec8b1ea9d5cf40f419b04291302aada08c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 1 22:03:13 2013 -0600

    Fix replying to related parts

 imp/lib/Compose.php |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/68fd8dec8b1ea9d5cf40f419b04291302aada08c

-----------------------------------------------------------------------

commit e31f31aca1018f2ac2171acc2089ca1683e3ed28
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Apr 2 00:38:36 2013 -0600

    These files should be removed at the end of the request

 imp/lib/Compose.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/e31f31aca1018f2ac2171acc2089ca1683e3ed28

-----------------------------------------------------------------------

commit 30b7243e0bd9c5d295f8b783da2bff2428d03861
Merge: e31f31a 0d66766
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Apr 2 14:35:21 2013 -0600

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 Dashboard/HordeBlock.wdgtproj/project.wdgt/Default.png            |  Bin 8731 -> 7650 bytes
 Dashboard/HordeBlock.wdgtproj/project.wdgt/Icon.png               |  Bin 8336 -> 8328 bytes
 .../HordeBlock.wdgtproj/project.wdgt/Images/DevelopedWith.png     |  Bin 3622 -> 3621 bytes
 Dashboard/HordeBlock.wdgtproj/project.wdgt/Images/back.png        |  Bin 103860 -> 102905 bytes
 Dashboard/HordeBlock.wdgtproj/project.wdgt/Images/front.png       |  Bin 7899 -> 7353 bytes
 Dashboard/HordeBlock.wdgtproj/project.wdgt/Images/popup_right.png |  Bin 482 -> 479 bytes
 agora/themes/default/graphics/agora.png                           |  Bin 246 -> 245 bytes
 ansel/themes/default/graphics/add.png                             |  Bin 4687 -> 609 bytes
 ansel/themes/default/graphics/allgalleries.png                    |  Bin 4948 -> 909 bytes
 ansel/themes/default/graphics/ansel.png                           |  Bin 454 -> 435 bytes
 ansel/themes/default/graphics/arrow_switch.png                    |  Bin 680 -> 656 bytes
 ansel/themes/default/graphics/bookmark.png                        |  Bin 292 -> 284 bytes
 ansel/themes/default/graphics/browse.png                          |  Bin 578 -> 570 bytes
 ansel/themes/default/graphics/down.png                            |  Bin 384 -> 343 bytes
 ansel/themes/default/graphics/embed.png                           |  Bin 579 -> 566 bytes
 ansel/themes/default/graphics/faces.png                           |  Bin 609 -> 601 bytes
 ansel/themes/default/graphics/galleries.png                       |  Bin 4817 -> 754 bytes
 ansel/themes/default/graphics/gallery-locked-mini.png             |  Bin 252 -> 250 bytes
 ansel/themes/default/graphics/gallery-locked.png                  |  Bin 548 -> 536 bytes
 ansel/themes/default/graphics/mini-error.png                      |  Bin 252 -> 250 bytes
 ansel/themes/default/graphics/mygalleries.png                     |  Bin 454 -> 435 bytes
 ansel/themes/default/graphics/plus.png                            |  Bin 626 -> 618 bytes
 ansel/themes/default/graphics/prettythumb-error.png               |  Bin 548 -> 536 bytes
 ansel/themes/default/graphics/problem.png                         |  Bin 591 -> 578 bytes
 ansel/themes/default/graphics/screen-error.png                    |  Bin 548 -> 536 bytes
 ansel/themes/default/graphics/slideshow_next.png                  |  Bin 451 -> 442 bytes
 ansel/themes/default/graphics/slideshow_pause.png                 |  Bin 222 -> 182 bytes
 ansel/themes/default/graphics/slideshow_play.png                  |  Bin 345 -> 336 bytes
 ansel/themes/default/graphics/slideshow_prev.png                  |  Bin 451 -> 422 bytes
 ansel/themes/default/graphics/text.png                            |  Bin 4109 -> 124 bytes
 ansel/themes/default/graphics/thumb-error.png                     |  Bin 548 -> 536 bytes
 ansel/themes/default/graphics/up.png                              |  Bin 370 -> 337 bytes
 beatnik/themes/default/graphics/beatnik.png                       |  Bin 727 -> 725 bytes
 chora/themes/default/graphics/back.png                            |  Bin 424 -> 423 bytes
 chora/themes/default/graphics/folder.png                          |  Bin 407 -> 403 bytes
 chora/themes/default/graphics/log.png                             |  Bin 152 -> 148 bytes
 folks/themes/default/graphics/folks.png                           |  Bin 661 -> 660 bytes
 framework/Core/js/map/img/cloud-popup-relative.png                |  Bin 2313 -> 2269 bytes
 framework/Core/js/map/img/drag-rectangle-off.png                  |  Bin 1037 -> 1032 bytes
 framework/Core/js/map/img/east-mini.png                           |  Bin 297 -> 287 bytes
 framework/Core/js/map/img/layer-switcher-maximize.png             |  Bin 297 -> 293 bytes
 framework/Core/js/map/img/layer-switcher-minimize.png             |  Bin 151 -> 144 bytes
 framework/Core/js/map/img/measuring-stick-off.png                 |  Bin 231 -> 229 bytes
 framework/Core/js/map/img/slider.png                              |  Bin 206 -> 203 bytes
 framework/Core/js/map/img/south-mini.png                          |  Bin 325 -> 319 bytes
 framework/Core/js/map/img/west-mini.png                           |  Bin 307 -> 300 bytes
 framework/Core/js/map/img/zoom-minus-mini.png                     |  Bin 237 -> 236 bytes
 framework/Core/js/map/img/zoom-world-mini.png                     |  Bin 802 -> 798 bytes
 framework/Core/js/map/theme/default/img/drag-rectangle-off.png    |  Bin 1024 -> 1017 bytes
 framework/Core/js/map/theme/default/img/editing_tool_bar.png      |  Bin 1870 -> 1852 bytes
 framework/Core/js/map/theme/default/img/view_next_on.png          |  Bin 1572 -> 1569 bytes
 framework/Core/js/map/theme/default/img/view_previous_off.png     |  Bin 851 -> 848 bytes
 framework/Core/js/map/theme/default/img/view_previous_on.png      |  Bin 1521 -> 1513 bytes
 framework/Core/lib/Horde/Registry.php                             |    3 +-
 .../js/ckeditor/plugins/showblocks/images/block_address.png       |  Bin 152 -> 151 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_div.png    |  Bin 127 -> 125 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h1.png     |  Bin 119 -> 118 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h2.png     |  Bin 127 -> 125 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h3.png     |  Bin 123 -> 122 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h4.png     |  Bin 123 -> 121 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h5.png     |  Bin 126 -> 124 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_h6.png     |  Bin 123 -> 122 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_p.png      |  Bin 115 -> 114 bytes
 .../Editor/js/ckeditor/plugins/showblocks/images/block_pre.png    |  Bin 127 -> 126 bytes
 .../Editor/js/ckeditor/plugins/uicolor/yui/assets/hue_bg.png      |  Bin 1019 -> 1018 bytes
 .../Editor/js/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png   |  Bin 133 -> 132 bytes
 .../Editor/js/ckeditor/plugins/uicolor/yui/assets/picker_mask.png |  Bin 10560 -> 10551 bytes
 framework/Editor/js/ckeditor/skins/kama/images/dialog_sides.png   |  Bin 126 -> 122 bytes
 .../Editor/js/ckeditor/skins/kama/images/dialog_sides_rtl.png     |  Bin 131 -> 121 bytes
 framework/Editor/js/ckeditor/skins/kama/images/sprites.png        |  Bin 5485 -> 5387 bytes
 framework/Editor/js/ckeditor/skins/kama/images/sprites_ie6.png    |  Bin 2558 -> 2500 bytes
 .../Editor/js/ckeditor/skins/office2003/images/dialog_sides.png   |  Bin 127 -> 121 bytes
 .../js/ckeditor/skins/office2003/images/dialog_sides_rtl.png      |  Bin 131 -> 121 bytes
 .../Editor/js/ckeditor/skins/office2003/images/sprites_ie6.png    |  Bin 2371 -> 2212 bytes
 framework/Editor/js/ckeditor/skins/v2/images/dialog_sides.png     |  Bin 126 -> 122 bytes
 framework/Editor/js/ckeditor/skins/v2/images/dialog_sides_rtl.png |  Bin 131 -> 121 bytes
 framework/Editor/js/ckeditor/skins/v2/images/sprites.png          |  Bin 2213 -> 2198 bytes
 .../Service_Weather/themes/default/graphics/weather/23x23/0.png   |  Bin 1143 -> 1136 bytes
 .../Service_Weather/themes/default/graphics/weather/23x23/17.png  |  Bin 1154 -> 1151 bytes
 .../Service_Weather/themes/default/graphics/weather/23x23/22.png  |  Bin 931 -> 929 bytes
 .../Service_Weather/themes/default/graphics/weather/23x23/24.png  |  Bin 590 -> 588 bytes
 .../Service_Weather/themes/default/graphics/weather/23x23/29.png  |  Bin 1093 -> 1090 bytes
 .../Service_Weather/themes/default/graphics/weather/23x23/3.png   |  Bin 1158 -> 1151 bytes
 .../Service_Weather/themes/default/graphics/weather/23x23/31.png  |  Bin 1050 -> 1041 bytes
 .../Service_Weather/themes/default/graphics/weather/23x23/35.png  |  Bin 1148 -> 1137 bytes
 .../Service_Weather/themes/default/graphics/weather/23x23/4.png   |  Bin 1152 -> 1145 bytes
 .../Service_Weather/themes/default/graphics/weather/23x23/47.png  |  Bin 1452 -> 1439 bytes
 .../Service_Weather/themes/default/graphics/weather/32x32/15.png  |  Bin 645 -> 642 bytes
 .../Service_Weather/themes/default/graphics/weather/32x32/na.png  |  Bin 994 -> 985 bytes
 .../themes/default/graphics/weather/wundergroundlogo.png          |  Bin 11688 -> 11590 bytes
 gollem/themes/default/graphics/az.png                             |  Bin 117 -> 116 bytes
 gollem/themes/default/graphics/clipboard.png                      |  Bin 476 -> 465 bytes
 gollem/themes/default/graphics/copy.png                           |  Bin 442 -> 425 bytes
 gollem/themes/default/graphics/cut.png                            |  Bin 553 -> 547 bytes
 gollem/themes/default/graphics/download.png                       |  Bin 422 -> 401 bytes
 gollem/themes/default/graphics/edit.png                           |  Bin 439 -> 425 bytes
 gollem/themes/default/graphics/filter-topbar.png                  |  Bin 390 -> 371 bytes
 gollem/themes/default/graphics/folder.png                         |  Bin 319 -> 305 bytes
 gollem/themes/default/graphics/folder_create.png                  |  Bin 434 -> 427 bytes
 gollem/themes/default/graphics/folder_goto.png                    |  Bin 441 -> 437 bytes
 gollem/themes/default/graphics/folder_home.png                    |  Bin 449 -> 430 bytes
 gollem/themes/default/graphics/folder_symlink.png                 |  Bin 548 -> 542 bytes
 gollem/themes/default/graphics/gollem.png                         |  Bin 319 -> 305 bytes
 gollem/themes/default/graphics/perms.png                          |  Bin 577 -> 575 bytes
 gollem/themes/default/graphics/perms_disabled.png                 |  Bin 489 -> 481 bytes
 gollem/themes/default/graphics/quota.png                          |  Bin 610 -> 599 bytes
 gollem/themes/default/graphics/za.png                             |  Bin 119 -> 118 bytes
 hermes/themes/default/graphics/admin.png                          |  Bin 667 -> 656 bytes
 hermes/themes/default/graphics/back_quick.png                     |  Bin 123 -> 122 bytes
 hermes/themes/default/graphics/checkbox_off.png                   |  Bin 116 -> 115 bytes
 hermes/themes/default/graphics/clients.png                        |  Bin 626 -> 625 bytes
 hermes/themes/default/graphics/delete.png                         |  Bin 412 -> 403 bytes
 hermes/themes/default/graphics/deliverable.png                    |  Bin 772 -> 771 bytes
 hermes/themes/default/graphics/edit.png                           |  Bin 277 -> 276 bytes
 hermes/themes/default/graphics/hermes.png                         |  Bin 666 -> 653 bytes
 hermes/themes/default/graphics/minus.png                          |  Bin 181 -> 180 bytes
 hermes/themes/default/graphics/pause.png                          |  Bin 226 -> 181 bytes
 hermes/themes/default/graphics/picker.png                         |  Bin 574 -> 553 bytes
 hermes/themes/default/graphics/play.png                           |  Bin 342 -> 335 bytes
 hermes/themes/default/graphics/plus.png                           |  Bin 208 -> 205 bytes
 hermes/themes/default/graphics/search.png                         |  Bin 465 -> 460 bytes
 hermes/themes/default/graphics/stop.png                           |  Bin 206 -> 166 bytes
 hermes/themes/default/graphics/time.png                           |  Bin 666 -> 653 bytes
 hermes/themes/default/graphics/timer-start.png                    |  Bin 680 -> 669 bytes
 hermes/themes/default/graphics/timer-stop.png                     |  Bin 682 -> 671 bytes
 horde/themes/default/graphics/add_group.png                       |  Bin 513 -> 490 bytes
 horde/themes/default/graphics/administration.png                  |  Bin 667 -> 656 bytes
 horde/themes/default/graphics/alerts/error.png                    |  Bin 545 -> 532 bytes
 horde/themes/default/graphics/alerts/message.png                  |  Bin 610 -> 599 bytes
 horde/themes/default/graphics/alerts/success.png                  |  Bin 604 -> 599 bytes
 horde/themes/default/graphics/alerts/warning.png                  |  Bin 548 -> 538 bytes
 horde/themes/default/graphics/app-unknown.png                     |  Bin 597 -> 592 bytes
 horde/themes/default/graphics/block/down.png                      |  Bin 115 -> 113 bytes
 horde/themes/default/graphics/block/large_down.png                |  Bin 125 -> 123 bytes
 horde/themes/default/graphics/block/large_left.png                |  Bin 122 -> 121 bytes
 horde/themes/default/graphics/block/large_right.png               |  Bin 122 -> 121 bytes
 horde/themes/default/graphics/block/large_up.png                  |  Bin 126 -> 125 bytes
 horde/themes/default/graphics/block/left.png                      |  Bin 122 -> 120 bytes
 horde/themes/default/graphics/block/weatherdotcom/23x23/0.png     |  Bin 1143 -> 1136 bytes
 horde/themes/default/graphics/block/weatherdotcom/23x23/17.png    |  Bin 1154 -> 1151 bytes
 horde/themes/default/graphics/block/weatherdotcom/23x23/22.png    |  Bin 931 -> 929 bytes
 horde/themes/default/graphics/block/weatherdotcom/23x23/24.png    |  Bin 590 -> 588 bytes
 horde/themes/default/graphics/block/weatherdotcom/23x23/29.png    |  Bin 1093 -> 1090 bytes
 horde/themes/default/graphics/block/weatherdotcom/23x23/3.png     |  Bin 1158 -> 1151 bytes
 horde/themes/default/graphics/block/weatherdotcom/23x23/31.png    |  Bin 1050 -> 1041 bytes
 horde/themes/default/graphics/block/weatherdotcom/23x23/35.png    |  Bin 1148 -> 1137 bytes
 horde/themes/default/graphics/block/weatherdotcom/23x23/4.png     |  Bin 1152 -> 1145 bytes
 horde/themes/default/graphics/block/weatherdotcom/23x23/47.png    |  Bin 1452 -> 1439 bytes
 horde/themes/default/graphics/block/weatherdotcom/32x32/15.png    |  Bin 645 -> 642 bytes
 .../default/graphics/block/weatherdotcom/32x32/TWClogo_32px.png   |  Bin 2097 -> 2096 bytes
 horde/themes/default/graphics/block/weatherdotcom/32x32/na.png    |  Bin 994 -> 985 bytes
 horde/themes/default/graphics/button-delete.png                   |  Bin 142 -> 141 bytes
 horde/themes/default/graphics/button-split.png                    |  Bin 88 -> 87 bytes
 horde/themes/default/graphics/buttonbar-bg.png                    |  Bin 108 -> 107 bytes
 horde/themes/default/graphics/calendar.png                        |  Bin 574 -> 553 bytes
 horde/themes/default/graphics/checkbox_on.png                     |  Bin 479 -> 477 bytes
 horde/themes/default/graphics/close.png                           |  Bin 647 -> 637 bytes
 horde/themes/default/graphics/collapse.png                        |  Bin 229 -> 227 bytes
 horde/themes/default/graphics/color-picker-palette.png            |  Bin 68856 -> 62801 bytes
 horde/themes/default/graphics/colorpicker.png                     |  Bin 619 -> 618 bytes
 horde/themes/default/graphics/config.png                          |  Bin 526 -> 509 bytes
 horde/themes/default/graphics/data.png                            |  Bin 530 -> 508 bytes
 horde/themes/default/graphics/delete.png                          |  Bin 412 -> 403 bytes
 horde/themes/default/graphics/download.png                        |  Bin 422 -> 401 bytes
 horde/themes/default/graphics/edit-sidebar-000.png                |  Bin 277 -> 276 bytes
 horde/themes/default/graphics/edit-small.png                      |  Bin 167 -> 166 bytes
 horde/themes/default/graphics/edit.png                            |  Bin 439 -> 425 bytes
 horde/themes/default/graphics/emoticons/asleep.png                |  Bin 247 -> 240 bytes
 horde/themes/default/graphics/emoticons/indifferent.png           |  Bin 248 -> 240 bytes
 horde/themes/default/graphics/emoticons/punk.png                  |  Bin 392 -> 391 bytes
 horde/themes/default/graphics/emoticons/tired.png                 |  Bin 244 -> 237 bytes
 horde/themes/default/graphics/expand.png                          |  Bin 235 -> 234 bytes
 horde/themes/default/graphics/feed.png                            |  Bin 549 -> 546 bytes
 horde/themes/default/graphics/filter-topbar.png                   |  Bin 390 -> 371 bytes
 horde/themes/default/graphics/filter.png                          |  Bin 437 -> 418 bytes
 horde/themes/default/graphics/flags/ae.png                        |  Bin 408 -> 328 bytes
 horde/themes/default/graphics/flags/ag.png                        |  Bin 509 -> 508 bytes
 horde/themes/default/graphics/flags/am.png                        |  Bin 385 -> 376 bytes
 horde/themes/default/graphics/flags/an.png                        |  Bin 488 -> 416 bytes
 horde/themes/default/graphics/flags/ao.png                        |  Bin 428 -> 419 bytes
 horde/themes/default/graphics/flags/ar.png                        |  Bin 420 -> 415 bytes
 horde/themes/default/graphics/flags/as.png                        |  Bin 593 -> 590 bytes
 horde/themes/default/graphics/flags/at.png                        |  Bin 343 -> 341 bytes
 horde/themes/default/graphics/flags/aw.png                        |  Bin 446 -> 436 bytes
 horde/themes/default/graphics/flags/az.png                        |  Bin 476 -> 471 bytes
 horde/themes/default/graphics/flags/ba.png                        |  Bin 524 -> 519 bytes
 horde/themes/default/graphics/flags/bb.png                        |  Bin 456 -> 453 bytes
 horde/themes/default/graphics/flags/bd.png                        |  Bin 425 -> 417 bytes
 horde/themes/default/graphics/flags/be.png                        |  Bin 346 -> 341 bytes
 horde/themes/default/graphics/flags/bf.png                        |  Bin 394 -> 393 bytes
 horde/themes/default/graphics/flags/bg.png                        |  Bin 373 -> 368 bytes
 horde/themes/default/graphics/flags/bh.png                        |  Bin 457 -> 390 bytes
 horde/themes/default/graphics/flags/bj.png                        |  Bin 364 -> 358 bytes
 horde/themes/default/graphics/flags/bn.png                        |  Bin 555 -> 552 bytes
 horde/themes/default/graphics/flags/bo.png                        |  Bin 394 -> 390 bytes
 horde/themes/default/graphics/flags/bs.png                        |  Bin 444 -> 441 bytes
 horde/themes/default/graphics/flags/bv.png                        |  Bin 450 -> 442 bytes
 horde/themes/default/graphics/flags/bw.png                        |  Bin 380 -> 373 bytes
 horde/themes/default/graphics/flags/by.png                        |  Bin 435 -> 431 bytes
 horde/themes/default/graphics/flags/bz.png                        |  Bin 529 -> 528 bytes
 horde/themes/default/graphics/flags/cd.png                        |  Bin 528 -> 510 bytes
 horde/themes/default/graphics/flags/cg.png                        |  Bin 433 -> 430 bytes
 horde/themes/default/graphics/flags/ch.png                        |  Bin 367 -> 297 bytes
 horde/themes/default/graphics/flags/ci.png                        |  Bin 359 -> 357 bytes
 horde/themes/default/graphics/flags/cm.png                        |  Bin 400 -> 398 bytes
 horde/themes/default/graphics/flags/cn.png                        |  Bin 402 -> 398 bytes
 horde/themes/default/graphics/flags/co.png                        |  Bin 383 -> 379 bytes
 horde/themes/default/graphics/flags/cr.png                        |  Bin 402 -> 398 bytes
 horde/themes/default/graphics/flags/cs.png                        |  Bin 374 -> 362 bytes
 horde/themes/default/graphics/flags/cv.png                        |  Bin 494 -> 490 bytes
 horde/themes/default/graphics/flags/cy.png                        |  Bin 428 -> 381 bytes
 horde/themes/default/graphics/flags/cz.png                        |  Bin 420 -> 410 bytes
 horde/themes/default/graphics/flags/de.png                        |  Bin 417 -> 408 bytes
 horde/themes/default/graphics/flags/dj.png                        |  Bin 483 -> 476 bytes
 horde/themes/default/graphics/flags/dk.png                        |  Bin 405 -> 400 bytes
 horde/themes/default/graphics/flags/do.png                        |  Bin 421 -> 416 bytes
 horde/themes/default/graphics/flags/ec.png                        |  Bin 408 -> 399 bytes
 horde/themes/default/graphics/flags/ee.png                        |  Bin 429 -> 343 bytes
 horde/themes/default/graphics/flags/eg.png                        |  Bin 401 -> 394 bytes
 horde/themes/default/graphics/flags/eh.png                        |  Bin 441 -> 438 bytes
 horde/themes/default/graphics/flags/es.png                        |  Bin 397 -> 389 bytes
 horde/themes/default/graphics/flags/et.png                        |  Bin 498 -> 493 bytes
 horde/themes/default/graphics/flags/fam.png                       |  Bin 403 -> 401 bytes
 horde/themes/default/graphics/flags/fi.png                        |  Bin 421 -> 420 bytes
 horde/themes/default/graphics/flags/fj.png                        |  Bin 570 -> 567 bytes
 horde/themes/default/graphics/flags/fk.png                        |  Bin 579 -> 575 bytes
 horde/themes/default/graphics/flags/fo.png                        |  Bin 474 -> 427 bytes
 horde/themes/default/graphics/flags/fr.png                        |  Bin 422 -> 419 bytes
 horde/themes/default/graphics/flags/ga.png                        |  Bin 395 -> 391 bytes
 horde/themes/default/graphics/flags/gd.png                        |  Bin 514 -> 513 bytes
 horde/themes/default/graphics/flags/ge.png                        |  Bin 546 -> 542 bytes
 horde/themes/default/graphics/flags/gf.png                        |  Bin 422 -> 419 bytes
 horde/themes/default/graphics/flags/gh.png                        |  Bin 389 -> 388 bytes
 horde/themes/default/graphics/flags/gi.png                        |  Bin 463 -> 415 bytes
 horde/themes/default/graphics/flags/gl.png                        |  Bin 404 -> 399 bytes
 horde/themes/default/graphics/flags/gm.png                        |  Bin 416 -> 409 bytes
 horde/themes/default/graphics/flags/gn.png                        |  Bin 372 -> 366 bytes
 horde/themes/default/graphics/flags/gp.png                        |  Bin 406 -> 399 bytes
 horde/themes/default/graphics/flags/gq.png                        |  Bin 458 -> 450 bytes
 horde/themes/default/graphics/flags/gr.png                        |  Bin 444 -> 440 bytes
 horde/themes/default/graphics/flags/gu.png                        |  Bin 437 -> 435 bytes
 horde/themes/default/graphics/flags/gw.png                        |  Bin 399 -> 398 bytes
 horde/themes/default/graphics/flags/hn.png                        |  Bin 464 -> 458 bytes
 horde/themes/default/graphics/flags/hr.png                        |  Bin 439 -> 430 bytes
 horde/themes/default/graphics/flags/ht.png                        |  Bin 380 -> 374 bytes
 horde/themes/default/graphics/flags/hu.png                        |  Bin 346 -> 340 bytes
 horde/themes/default/graphics/flags/id.png                        |  Bin 430 -> 352 bytes
 horde/themes/default/graphics/flags/ie.png                        |  Bin 386 -> 382 bytes
 horde/themes/default/graphics/flags/il.png                        |  Bin 431 -> 376 bytes
 horde/themes/default/graphics/flags/in.png                        |  Bin 430 -> 420 bytes
 horde/themes/default/graphics/flags/iq.png                        |  Bin 456 -> 451 bytes
 horde/themes/default/graphics/flags/ir.png                        |  Bin 451 -> 447 bytes
 horde/themes/default/graphics/flags/is.png                        |  Bin 463 -> 462 bytes
 horde/themes/default/graphics/flags/it.png                        |  Bin 420 -> 333 bytes
 horde/themes/default/graphics/flags/jo.png                        |  Bin 406 -> 403 bytes
 horde/themes/default/graphics/flags/jp.png                        |  Bin 420 -> 361 bytes
 horde/themes/default/graphics/flags/ke.png                        |  Bin 488 -> 487 bytes
 horde/themes/default/graphics/flags/kg.png                        |  Bin 407 -> 401 bytes
 horde/themes/default/graphics/flags/kh.png                        |  Bin 475 -> 472 bytes
 horde/themes/default/graphics/flags/km.png                        |  Bin 509 -> 508 bytes
 horde/themes/default/graphics/flags/kn.png                        |  Bin 533 -> 529 bytes
 horde/themes/default/graphics/flags/kp.png                        |  Bin 477 -> 473 bytes
 horde/themes/default/graphics/flags/kr.png                        |  Bin 560 -> 559 bytes
 horde/themes/default/graphics/flags/kw.png                        |  Bin 404 -> 403 bytes
 horde/themes/default/graphics/flags/la.png                        |  Bin 468 -> 463 bytes
 horde/themes/default/graphics/flags/lb.png                        |  Bin 446 -> 443 bytes
 horde/themes/default/graphics/flags/li.png                        |  Bin 452 -> 444 bytes
 horde/themes/default/graphics/flags/lr.png                        |  Bin 466 -> 428 bytes
 horde/themes/default/graphics/flags/ls.png                        |  Bin 553 -> 551 bytes
 horde/themes/default/graphics/flags/lt.png                        |  Bin 398 -> 392 bytes
 horde/themes/default/graphics/flags/lu.png                        |  Bin 391 -> 381 bytes
 horde/themes/default/graphics/flags/lv.png                        |  Bin 392 -> 386 bytes
 horde/themes/default/graphics/flags/ly.png                        |  Bin 465 -> 449 bytes
 horde/themes/default/graphics/flags/ma.png                        |  Bin 346 -> 338 bytes
 horde/themes/default/graphics/flags/mc.png                        |  Bin 380 -> 309 bytes
 horde/themes/default/graphics/flags/mg.png                        |  Bin 366 -> 360 bytes
 horde/themes/default/graphics/flags/ml.png                        |  Bin 375 -> 366 bytes
 horde/themes/default/graphics/flags/mm.png                        |  Bin 389 -> 388 bytes
 horde/themes/default/graphics/flags/mn.png                        |  Bin 396 -> 392 bytes
 horde/themes/default/graphics/flags/mt.png                        |  Bin 420 -> 346 bytes
 horde/themes/default/graphics/flags/mu.png                        |  Bin 413 -> 405 bytes
 horde/themes/default/graphics/flags/mw.png                        |  Bin 418 -> 416 bytes
 horde/themes/default/graphics/flags/mz.png                        |  Bin 492 -> 482 bytes
 horde/themes/default/graphics/flags/nc.png                        |  Bin 422 -> 419 bytes
 horde/themes/default/graphics/flags/ne.png                        |  Bin 446 -> 436 bytes
 horde/themes/default/graphics/flags/ng.png                        |  Bin 394 -> 390 bytes
 horde/themes/default/graphics/flags/nl.png                        |  Bin 363 -> 360 bytes
 horde/themes/default/graphics/flags/no.png                        |  Bin 450 -> 442 bytes
 horde/themes/default/graphics/flags/np.png                        |  Bin 352 -> 351 bytes
 horde/themes/default/graphics/flags/nr.png                        |  Bin 444 -> 442 bytes
 horde/themes/default/graphics/flags/pa.png                        |  Bin 443 -> 436 bytes
 horde/themes/default/graphics/flags/pe.png                        |  Bin 397 -> 314 bytes
 horde/themes/default/graphics/flags/pf.png                        |  Bin 432 -> 430 bytes
 horde/themes/default/graphics/flags/pg.png                        |  Bin 491 -> 488 bytes
 horde/themes/default/graphics/flags/ph.png                        |  Bin 469 -> 467 bytes
 horde/themes/default/graphics/flags/pl.png                        |  Bin 374 -> 294 bytes
 horde/themes/default/graphics/flags/pn.png                        |  Bin 600 -> 599 bytes
 horde/themes/default/graphics/flags/ps.png                        |  Bin 472 -> 396 bytes
 horde/themes/default/graphics/flags/pt.png                        |  Bin 460 -> 457 bytes
 horde/themes/default/graphics/flags/pw.png                        |  Bin 477 -> 476 bytes
 horde/themes/default/graphics/flags/py.png                        |  Bin 397 -> 393 bytes
 horde/themes/default/graphics/flags/qa.png                        |  Bin 450 -> 391 bytes
 horde/themes/default/graphics/flags/re.png                        |  Bin 422 -> 419 bytes
 horde/themes/default/graphics/flags/ro.png                        |  Bin 386 -> 380 bytes
 horde/themes/default/graphics/flags/ru.png                        |  Bin 352 -> 347 bytes
 horde/themes/default/graphics/flags/rw.png                        |  Bin 435 -> 433 bytes
 horde/themes/default/graphics/flags/sc.png                        |  Bin 534 -> 532 bytes
 horde/themes/default/graphics/flags/scotland.png                  |  Bin 607 -> 606 bytes
 horde/themes/default/graphics/flags/se.png                        |  Bin 442 -> 440 bytes
 horde/themes/default/graphics/flags/sg.png                        |  Bin 403 -> 399 bytes
 horde/themes/default/graphics/flags/sh.png                        |  Bin 577 -> 576 bytes
 horde/themes/default/graphics/flags/si.png                        |  Bin 436 -> 427 bytes
 horde/themes/default/graphics/flags/sj.png                        |  Bin 450 -> 442 bytes
 horde/themes/default/graphics/flags/sl.png                        |  Bin 374 -> 369 bytes
 horde/themes/default/graphics/flags/sm.png                        |  Bin 449 -> 447 bytes
 horde/themes/default/graphics/flags/sn.png                        |  Bin 409 -> 408 bytes
 horde/themes/default/graphics/flags/so.png                        |  Bin 429 -> 427 bytes
 horde/themes/default/graphics/flags/sr.png                        |  Bin 423 -> 422 bytes
 horde/themes/default/graphics/flags/st.png                        |  Bin 482 -> 481 bytes
 horde/themes/default/graphics/flags/sv.png                        |  Bin 426 -> 420 bytes
 horde/themes/default/graphics/flags/sy.png                        |  Bin 422 -> 374 bytes
 horde/themes/default/graphics/flags/sz.png                        |  Bin 561 -> 558 bytes
 horde/themes/default/graphics/flags/td.png                        |  Bin 431 -> 430 bytes
 horde/themes/default/graphics/flags/tf.png                        |  Bin 452 -> 450 bytes
 horde/themes/default/graphics/flags/tg.png                        |  Bin 463 -> 461 bytes
 horde/themes/default/graphics/flags/th.png                        |  Bin 380 -> 378 bytes
 horde/themes/default/graphics/flags/tj.png                        |  Bin 496 -> 412 bytes
 horde/themes/default/graphics/flags/tl.png                        |  Bin 448 -> 446 bytes
 horde/themes/default/graphics/flags/tn.png                        |  Bin 420 -> 417 bytes
 horde/themes/default/graphics/flags/to.png                        |  Bin 426 -> 352 bytes
 horde/themes/default/graphics/flags/tp.png                        |  Bin 737 -> 735 bytes
 horde/themes/default/graphics/flags/tr.png                        |  Bin 419 -> 415 bytes
 horde/themes/default/graphics/flags/tv.png                        |  Bin 496 -> 490 bytes
 horde/themes/default/graphics/flags/tw.png                        |  Bin 383 -> 382 bytes
 horde/themes/default/graphics/flags/ua.png                        |  Bin 357 -> 352 bytes
 horde/themes/default/graphics/flags/ug.png                        |  Bin 441 -> 433 bytes
 horde/themes/default/graphics/flags/us.png                        |  Bin 545 -> 542 bytes
 horde/themes/default/graphics/flags/uy.png                        |  Bin 464 -> 461 bytes
 horde/themes/default/graphics/flags/uz.png                        |  Bin 464 -> 456 bytes
 horde/themes/default/graphics/flags/va.png                        |  Bin 472 -> 467 bytes
 horde/themes/default/graphics/flags/ve.png                        |  Bin 465 -> 456 bytes
 horde/themes/default/graphics/flags/vg.png                        |  Bin 563 -> 560 bytes
 horde/themes/default/graphics/flags/vn.png                        |  Bin 377 -> 373 bytes
 horde/themes/default/graphics/flags/vu.png                        |  Bin 503 -> 498 bytes
 horde/themes/default/graphics/flags/ws.png                        |  Bin 405 -> 402 bytes
 horde/themes/default/graphics/flags/ye.png                        |  Bin 355 -> 348 bytes
 horde/themes/default/graphics/flags/zm.png                        |  Bin 412 -> 408 bytes
 horde/themes/default/graphics/flags/zw.png                        |  Bin 515 -> 510 bytes
 horde/themes/default/graphics/google.png                          |  Bin 1565 -> 1561 bytes
 horde/themes/default/graphics/group.png                           |  Bin 609 -> 601 bytes
 horde/themes/default/graphics/help.png                            |  Bin 597 -> 592 bytes
 horde/themes/default/graphics/help_index.png                      |  Bin 597 -> 592 bytes
 horde/themes/default/graphics/hide_panel.png                      |  Bin 419 -> 417 bytes
 horde/themes/default/graphics/image/grayscale.png                 |  Bin 238 -> 235 bytes
 horde/themes/default/graphics/image/ratio.png                     |  Bin 256 -> 254 bytes
 horde/themes/default/graphics/info.png                            |  Bin 414 -> 404 bytes
 horde/themes/default/graphics/info_icon.png                       |  Bin 610 -> 599 bytes
 horde/themes/default/graphics/keyboard.png                        |  Bin 549 -> 528 bytes
 horde/themes/default/graphics/keys/left.png                       |  Bin 196 -> 195 bytes
 horde/themes/default/graphics/keys/right.png                      |  Bin 197 -> 195 bytes
 horde/themes/default/graphics/lhand.png                           |  Bin 455 -> 454 bytes
 horde/themes/default/graphics/login.png                           |  Bin 689 -> 687 bytes
 horde/themes/default/graphics/map/marker-shadow.png               |  Bin 327 -> 325 bytes
 horde/themes/default/graphics/mime/audio.png                      |  Bin 607 -> 606 bytes
 horde/themes/default/graphics/mime/binary.png                     |  Bin 402 -> 400 bytes
 horde/themes/default/graphics/mime/compressed.png                 |  Bin 732 -> 684 bytes
 horde/themes/default/graphics/mime/deb.png                        |  Bin 607 -> 606 bytes
 horde/themes/default/graphics/mime/encryption.png                 |  Bin 749 -> 737 bytes
 horde/themes/default/graphics/mime/html.png                       |  Bin 542 -> 539 bytes
 horde/themes/default/graphics/mime/msexcel.png                    |  Bin 604 -> 603 bytes
 horde/themes/default/graphics/mime/mspowerpoint.png               |  Bin 543 -> 541 bytes
 horde/themes/default/graphics/mime/msword.png                     |  Bin 630 -> 629 bytes
 horde/themes/default/graphics/mime/ooo_calc.png                   |  Bin 604 -> 603 bytes
 horde/themes/default/graphics/mime/ooo_impress.png                |  Bin 543 -> 541 bytes
 horde/themes/default/graphics/mime/ooo_math.png                   |  Bin 294 -> 288 bytes
 horde/themes/default/graphics/mime/ooo_writer.png                 |  Bin 630 -> 629 bytes
 horde/themes/default/graphics/mime/pdf.png                        |  Bin 530 -> 527 bytes
 horde/themes/default/graphics/mime/rpm.png                        |  Bin 607 -> 606 bytes
 horde/themes/default/graphics/mime/script-js.png                  |  Bin 526 -> 524 bytes
 horde/themes/default/graphics/mime/source-python.png              |  Bin 402 -> 400 bytes
 horde/themes/default/graphics/mime/text.png                       |  Bin 342 -> 332 bytes
 horde/themes/default/graphics/mime/vcard.png                      |  Bin 533 -> 531 bytes
 horde/themes/default/graphics/mime/xml.png                        |  Bin 542 -> 539 bytes
 horde/themes/default/graphics/minus.png                           |  Bin 545 -> 532 bytes
 horde/themes/default/graphics/mobile.png                          |  Bin 416 -> 402 bytes
 horde/themes/default/graphics/nav/bottom.png                      |  Bin 613 -> 611 bytes
 horde/themes/default/graphics/nav/first-grey.png                  |  Bin 330 -> 324 bytes
 horde/themes/default/graphics/nav/last-grey.png                   |  Bin 307 -> 297 bytes
 horde/themes/default/graphics/nav/left-grey.png                   |  Bin 235 -> 227 bytes
 horde/themes/default/graphics/nav/left.png                        |  Bin 381 -> 377 bytes
 horde/themes/default/graphics/nav/right-grey.png                  |  Bin 218 -> 203 bytes
 horde/themes/default/graphics/nav/right.png                       |  Bin 384 -> 381 bytes
 horde/themes/default/graphics/nav/top.png                         |  Bin 603 -> 602 bytes
 horde/themes/default/graphics/navi-arrow-active.png               |  Bin 299 -> 262 bytes
 horde/themes/default/graphics/navi-arrow-normal.png               |  Bin 223 -> 221 bytes
 horde/themes/default/graphics/navi-center-active.png              |  Bin 108 -> 107 bytes
 horde/themes/default/graphics/navi-left-active.png                |  Bin 228 -> 217 bytes
 horde/themes/default/graphics/navi-right-active.png               |  Bin 204 -> 197 bytes
 horde/themes/default/graphics/navi-subnavi-active.png             |  Bin 319 -> 281 bytes
 horde/themes/default/graphics/navi-subnavi.png                    |  Bin 209 -> 207 bytes
 horde/themes/default/graphics/office.png                          |  Bin 461 -> 445 bytes
 horde/themes/default/graphics/organizing.png                      |  Bin 436 -> 426 bytes
 horde/themes/default/graphics/perms.png                           |  Bin 577 -> 575 bytes
 horde/themes/default/graphics/phone.png                           |  Bin 416 -> 402 bytes
 horde/themes/default/graphics/plus.png                            |  Bin 626 -> 618 bytes
 horde/themes/default/graphics/popdown.png                         |  Bin 285 -> 261 bytes
 horde/themes/default/graphics/popright.png                        |  Bin 118 -> 114 bytes
 horde/themes/default/graphics/print.png                           |  Bin 464 -> 455 bytes
 horde/themes/default/graphics/problem.png                         |  Bin 591 -> 578 bytes
 horde/themes/default/graphics/radiobox_off.png                    |  Bin 628 -> 472 bytes
 horde/themes/default/graphics/radiobox_on.png                     |  Bin 727 -> 588 bytes
 horde/themes/default/graphics/required.png                        |  Bin 485 -> 475 bytes
 horde/themes/default/graphics/rhand.png                           |  Bin 453 -> 451 bytes
 horde/themes/default/graphics/save.png                            |  Bin 422 -> 401 bytes
 horde/themes/default/graphics/search-topbar.png                   |  Bin 447 -> 445 bytes
 horde/themes/default/graphics/search.png                          |  Bin 465 -> 460 bytes
 horde/themes/default/graphics/settings-active.png                 |  Bin 543 -> 535 bytes
 horde/themes/default/graphics/shadow.png                          |  Bin 1910 -> 1901 bytes
 horde/themes/default/graphics/shell.png                           |  Bin 366 -> 353 bytes
 horde/themes/default/graphics/show_panel.png                      |  Bin 404 -> 379 bytes
 horde/themes/default/graphics/sidebar-new.png                     |  Bin 439 -> 436 bytes
 horde/themes/default/graphics/sidebar-refresh.png                 |  Bin 512 -> 511 bytes
 horde/themes/default/graphics/sidebar-split.png                   |  Bin 97 -> 87 bytes
 horde/themes/default/graphics/slidehoriz.png                      |  Bin 114 -> 105 bytes
 horde/themes/default/graphics/sql.png                             |  Bin 644 -> 637 bytes
 horde/themes/default/graphics/tab-active.png                      |  Bin 103 -> 98 bytes
 horde/themes/default/graphics/tags.png                            |  Bin 473 -> 463 bytes
 horde/themes/default/graphics/tree/folder.png                     |  Bin 319 -> 305 bytes
 horde/themes/default/graphics/tree/folderopen.png                 |  Bin 441 -> 437 bytes
 horde/themes/default/graphics/tree/joinbottom-down.png            |  Bin 111 -> 110 bytes
 horde/themes/default/graphics/tree/minusonly.png                  |  Bin 121 -> 120 bytes
 horde/themes/default/graphics/tree/minustop.png                   |  Bin 125 -> 124 bytes
 horde/themes/default/graphics/tree/nullonly.png                   |  Bin 119 -> 118 bytes
 horde/themes/default/graphics/tree/plusonly.png                   |  Bin 125 -> 124 bytes
 horde/themes/default/graphics/tree/plustop.png                    |  Bin 129 -> 128 bytes
 horde/themes/default/graphics/tree/rev-joinbottom-down.png        |  Bin 111 -> 110 bytes
 horde/themes/default/graphics/tree/rev-line.png                   |  Bin 108 -> 107 bytes
 horde/themes/default/graphics/tree/rev-minus.png                  |  Bin 133 -> 131 bytes
 horde/themes/default/graphics/tree/rev-minusbottom.png            |  Bin 134 -> 132 bytes
 horde/themes/default/graphics/tree/rev-minusonly.png              |  Bin 126 -> 125 bytes
 horde/themes/default/graphics/tree/rev-minustop.png               |  Bin 130 -> 129 bytes
 horde/themes/default/graphics/tree/rev-nullonly.png               |  Bin 125 -> 124 bytes
 horde/themes/default/graphics/tree/rev-plus.png                   |  Bin 137 -> 136 bytes
 horde/themes/default/graphics/tree/rev-plusbottom.png             |  Bin 139 -> 137 bytes
 horde/themes/default/graphics/tree/rev-plusonly.png               |  Bin 131 -> 130 bytes
 horde/themes/default/graphics/tree/rev-plustop.png                |  Bin 135 -> 134 bytes
 horde/themes/default/graphics/unlocked.png                        |  Bin 448 -> 433 bytes
 horde/themes/default/graphics/website.png                         |  Bin 536 -> 535 bytes
 horde/themes/default/graphics/za.png                              |  Bin 338 -> 337 bytes
 hylax/themes/default/graphics/folder.png                          |  Bin 407 -> 403 bytes
 iPhoto2Ansel/Resources/iPhotoPluginIcon.png                       |  Bin 18837 -> 18803 bytes
 imp/docs/CHANGES                                                  |    2 +
 imp/js/smartmobile.js                                             |    2 +-
 imp/package.xml                                                   |    1 +
 imp/themes/default/graphics/add_contact.png                       |  Bin 500 -> 497 bytes
 imp/themes/default/graphics/addressbook_browse.png                |  Bin 426 -> 425 bytes
 imp/themes/default/graphics/answered.png                          |  Bin 521 -> 514 bytes
 imp/themes/default/graphics/application_tile_horizontal.png       |  Bin 430 -> 427 bytes
 imp/themes/default/graphics/application_tile_vertical.png         |  Bin 453 -> 446 bytes
 imp/themes/default/graphics/arrow_collapsed.png                   |  Bin 235 -> 234 bytes
 imp/themes/default/graphics/arrow_expanded.png                    |  Bin 229 -> 227 bytes
 imp/themes/default/graphics/arrow_up.png                          |  Bin 338 -> 337 bytes
 imp/themes/default/graphics/blacklist.png                         |  Bin 625 -> 624 bytes
 imp/themes/default/graphics/button-split.png                      |  Bin 88 -> 87 bytes
 imp/themes/default/graphics/calendar.png                          |  Bin 574 -> 553 bytes
 imp/themes/default/graphics/checkbox_on.png                       |  Bin 479 -> 477 bytes
 imp/themes/default/graphics/checkbox_over.png                     |  Bin 479 -> 477 bytes
 imp/themes/default/graphics/checkmail.png                         |  Bin 678 -> 676 bytes
 imp/themes/default/graphics/clearflag.png                         |  Bin 364 -> 351 bytes
 imp/themes/default/graphics/close.png                             |  Bin 647 -> 637 bytes
 imp/themes/default/graphics/compose.png                           |  Bin 486 -> 463 bytes
 imp/themes/default/graphics/delete.png                            |  Bin 408 -> 399 bytes
 imp/themes/default/graphics/download.png                          |  Bin 422 -> 401 bytes
 imp/themes/default/graphics/drafts.png                            |  Bin 623 -> 610 bytes
 imp/themes/default/graphics/edit.png                              |  Bin 439 -> 425 bytes
 imp/themes/default/graphics/empty_spam.png                        |  Bin 524 -> 523 bytes
 imp/themes/default/graphics/empty_trash.png                       |  Bin 524 -> 523 bytes
 imp/themes/default/graphics/fetchmail.png                         |  Bin 678 -> 676 bytes
 imp/themes/default/graphics/filters.png                           |  Bin 435 -> 418 bytes
 imp/themes/default/graphics/flagged.png                           |  Bin 373 -> 362 bytes
 imp/themes/default/graphics/flags/answered-inv.png                |  Bin 208 -> 207 bytes
 imp/themes/default/graphics/flags/answered.png                    |  Bin 208 -> 207 bytes
 imp/themes/default/graphics/flags/attachment-inv.png              |  Bin 528 -> 526 bytes
 imp/themes/default/graphics/flags/encrypted-inv.png               |  Bin 280 -> 278 bytes
 imp/themes/default/graphics/flags/encrypted.png                   |  Bin 280 -> 278 bytes
 imp/themes/default/graphics/flags/flagged-inv.png                 |  Bin 264 -> 262 bytes
 imp/themes/default/graphics/flags/flagged.png                     |  Bin 264 -> 262 bytes
 imp/themes/default/graphics/flags/forwarded-inv.png               |  Bin 208 -> 207 bytes
 imp/themes/default/graphics/flags/forwarded.png                   |  Bin 208 -> 207 bytes
 imp/themes/default/graphics/flags/signed-inv.png                  |  Bin 280 -> 278 bytes
 imp/themes/default/graphics/flags/signed.png                      |  Bin 280 -> 278 bytes
 imp/themes/default/graphics/folders/create.png                    |  Bin 434 -> 427 bytes
 imp/themes/default/graphics/folders/drafts.png                    |  Bin 625 -> 610 bytes
 imp/themes/default/graphics/folders/edit.png                      |  Bin 486 -> 463 bytes
 imp/themes/default/graphics/folders/folder.png                    |  Bin 319 -> 305 bytes
 imp/themes/default/graphics/folders/inbox.png                     |  Bin 555 -> 550 bytes
 imp/themes/default/graphics/folders/minus.png                     |  Bin 442 -> 427 bytes
 imp/themes/default/graphics/folders/open.png                      |  Bin 441 -> 437 bytes
 imp/themes/default/graphics/folders/plus.png                      |  Bin 419 -> 418 bytes
 imp/themes/default/graphics/folders/sent.png                      |  Bin 535 -> 532 bytes
 imp/themes/default/graphics/folders/spam.png                      |  Bin 557 -> 556 bytes
 imp/themes/default/graphics/folders/trash.png                     |  Bin 408 -> 399 bytes
 imp/themes/default/graphics/forward.png                           |  Bin 365 -> 357 bytes
 imp/themes/default/graphics/forwarded.png                         |  Bin 520 -> 517 bytes
 imp/themes/default/graphics/gallery.png                           |  Bin 454 -> 435 bytes
 imp/themes/default/graphics/ico_message_off.png                   |  Bin 598 -> 587 bytes
 imp/themes/default/graphics/imp.png                               |  Bin 450 -> 447 bytes
 imp/themes/default/graphics/info_icon.png                         |  Bin 610 -> 599 bytes
 imp/themes/default/graphics/locked-inv.png                        |  Bin 431 -> 429 bytes
 imp/themes/default/graphics/mime/apple.png                        |  Bin 157 -> 156 bytes
 imp/themes/default/graphics/mini-error.png                        |  Bin 252 -> 250 bytes
 imp/themes/default/graphics/nav/first-grey.png                    |  Bin 330 -> 324 bytes
 imp/themes/default/graphics/nav/last-grey.png                     |  Bin 307 -> 297 bytes
 imp/themes/default/graphics/nav/left-grey.png                     |  Bin 235 -> 227 bytes
 imp/themes/default/graphics/nav/left.png                          |  Bin 381 -> 377 bytes
 imp/themes/default/graphics/nav/right-grey.png                    |  Bin 218 -> 203 bytes
 imp/themes/default/graphics/nav/right.png                         |  Bin 384 -> 381 bytes
 imp/themes/default/graphics/newmail.png                           |  Bin 678 -> 676 bytes
 imp/themes/default/graphics/newwin.png                            |  Bin 442 -> 425 bytes
 imp/themes/default/graphics/plus.png                              |  Bin 626 -> 618 bytes
 imp/themes/default/graphics/popdown.png                           |  Bin 285 -> 261 bytes
 imp/themes/default/graphics/print.png                             |  Bin 464 -> 455 bytes
 imp/themes/default/graphics/reply.png                             |  Bin 358 -> 344 bytes
 imp/themes/default/graphics/replyall.png                          |  Bin 422 -> 418 bytes
 imp/themes/default/graphics/sbcursor_top.png                      |  Bin 145 -> 144 bytes
 imp/themes/default/graphics/scroller_back.png                     |  Bin 112 -> 111 bytes
 imp/themes/default/graphics/search.png                            |  Bin 465 -> 460 bytes
 imp/themes/default/graphics/shared.png                            |  Bin 449 -> 448 bytes
 imp/themes/default/graphics/sortdown.png                          |  Bin 117 -> 116 bytes
 imp/themes/default/graphics/sortup.png                            |  Bin 119 -> 118 bytes
 imp/themes/default/graphics/spam.png                              |  Bin 557 -> 556 bytes
 imp/themes/default/graphics/spellcheck.png                        |  Bin 443 -> 441 bytes
 imp/themes/default/graphics/undelete.png                          |  Bin 412 -> 403 bytes
 imp/themes/default/graphics/unseen.png                            |  Bin 476 -> 471 bytes
 imp/themes/default/graphics/warning.png                           |  Bin 548 -> 538 bytes
 imp/themes/default/graphics/whitelist.png                         |  Bin 618 -> 612 bytes
 ingo/docs/CHANGES                                                 |    2 +
 ingo/js/smartmobile.js                                            |    4 +-
 ingo/package.xml                                                  |    2 +
 ingo/themes/default/graphics/blacklist.png                        |  Bin 625 -> 624 bytes
 ingo/themes/default/graphics/copy.png                             |  Bin 310 -> 299 bytes
 ingo/themes/default/graphics/enable.png                           |  Bin 442 -> 417 bytes
 ingo/themes/default/graphics/forward.png                          |  Bin 365 -> 357 bytes
 ingo/themes/default/graphics/ingo.png                             |  Bin 435 -> 418 bytes
 ingo/themes/default/graphics/script.png                           |  Bin 414 -> 397 bytes
 ingo/themes/default/graphics/vacation.png                         |  Bin 606 -> 590 bytes
 ingo/themes/default/graphics/whitelist.png                        |  Bin 618 -> 612 bytes
 jonah/themes/default/graphics/atom.png                            |  Bin 253 -> 252 bytes
 jonah/themes/default/graphics/az.png                              |  Bin 117 -> 116 bytes
 jonah/themes/default/graphics/lists.png                           |  Bin 223 -> 221 bytes
 jonah/themes/default/graphics/za.png                              |  Bin 119 -> 118 bytes
 klutz/themes/default/graphics/klutz_butter.png                    |  Bin 16341 -> 15738 bytes
 koward/www/htdocs/horde/themes/graphics/alerts/alarm.png          |  Bin 422 -> 421 bytes
 koward/www/htdocs/horde/themes/graphics/alerts/error.png          |  Bin 184 -> 183 bytes
 koward/www/htdocs/horde/themes/graphics/alerts/warning.png        |  Bin 169 -> 168 bytes
 koward/www/htdocs/horde/themes/graphics/plus.png                  |  Bin 208 -> 205 bytes
 koward/www/htdocs/horde/themes/graphics/search.png                |  Bin 662 -> 661 bytes
 koward/www/htdocs/horde/themes/graphics/user.png                  |  Bin 661 -> 660 bytes
 koward/www/htdocs/horde/themes/silver/graphics/alerts/error.png   |  Bin 671 -> 669 bytes
 koward/www/htdocs/horde/themes/silver/graphics/alerts/warning.png |  Bin 619 -> 618 bytes
 .../www/htdocs/horde/themes/silver/graphics/currentTab_left.png   |  Bin 161 -> 156 bytes
 .../www/htdocs/horde/themes/silver/graphics/currentTab_right.png  |  Bin 286 -> 285 bytes
 koward/www/htdocs/horde/themes/silver/graphics/delete.png         |  Bin 362 -> 361 bytes
 koward/www/htdocs/horde/themes/silver/graphics/plus.png           |  Bin 676 -> 675 bytes
 koward/www/htdocs/horde/themes/silver/graphics/required.png       |  Bin 433 -> 424 bytes
 koward/www/htdocs/horde/themes/silver/graphics/tab_left.png       |  Bin 358 -> 343 bytes
 koward/www/htdocs/horde/themes/silver/graphics/tab_right.png      |  Bin 1902 -> 1824 bytes
 koward/www/htdocs/horde/themes/silver/graphics/user.png           |  Bin 668 -> 667 bytes
 kronolith/themes/default/graphics/addressbook_browse.png          |  Bin 537 -> 535 bytes
 kronolith/themes/default/graphics/agenda.png                      |  Bin 179 -> 178 bytes
 kronolith/themes/default/graphics/alarm.png                       |  Bin 479 -> 476 bytes
 kronolith/themes/default/graphics/alerts/error.png                |  Bin 545 -> 532 bytes
 kronolith/themes/default/graphics/alerts/message.png              |  Bin 610 -> 599 bytes
 kronolith/themes/default/graphics/alerts/success.png              |  Bin 604 -> 599 bytes
 kronolith/themes/default/graphics/alerts/warning.png              |  Bin 548 -> 538 bytes
 kronolith/themes/default/graphics/attendee-accepted.png           |  Bin 604 -> 599 bytes
 kronolith/themes/default/graphics/attendee-declined.png           |  Bin 545 -> 532 bytes
 kronolith/themes/default/graphics/attendee-none.png               |  Bin 597 -> 592 bytes
 kronolith/themes/default/graphics/attendees.png                   |  Bin 609 -> 601 bytes
 kronolith/themes/default/graphics/back.png                        |  Bin 358 -> 344 bytes
 kronolith/themes/default/graphics/big_invitation.png              |  Bin 2504 -> 2475 bytes
 kronolith/themes/default/graphics/calendars.png                   |  Bin 574 -> 553 bytes
 kronolith/themes/default/graphics/checkbox_on.png                 |  Bin 479 -> 477 bytes
 kronolith/themes/default/graphics/checkbox_over.png               |  Bin 479 -> 477 bytes
 kronolith/themes/default/graphics/close.png                       |  Bin 647 -> 637 bytes
 kronolith/themes/default/graphics/data.png                        |  Bin 530 -> 508 bytes
 kronolith/themes/default/graphics/drag-handle.png                 |  Bin 105 -> 103 bytes
 kronolith/themes/default/graphics/exception-000.png               |  Bin 437 -> 435 bytes
 kronolith/themes/default/graphics/goto.png                        |  Bin 533 -> 516 bytes
 kronolith/themes/default/graphics/help.png                        |  Bin 597 -> 592 bytes
 kronolith/themes/default/graphics/kronolith.png                   |  Bin 574 -> 553 bytes
 kronolith/themes/default/graphics/left.png                        |  Bin 294 -> 292 bytes
 kronolith/themes/default/graphics/minus.png                       |  Bin 545 -> 532 bytes
 kronolith/themes/default/graphics/new_big.png                     |  Bin 626 -> 618 bytes
 kronolith/themes/default/graphics/new_small.png                   |  Bin 161 -> 159 bytes
 kronolith/themes/default/graphics/new_task.png                    |  Bin 516 -> 512 bytes
 kronolith/themes/default/graphics/picker.png                      |  Bin 574 -> 553 bytes
 kronolith/themes/default/graphics/plus.png                        |  Bin 626 -> 618 bytes
 kronolith/themes/default/graphics/print.png                       |  Bin 464 -> 455 bytes
 kronolith/themes/default/graphics/private-000.png                 |  Bin 236 -> 234 bytes
 kronolith/themes/default/graphics/private-fff.png                 |  Bin 236 -> 234 bytes
 kronolith/themes/default/graphics/right.png                       |  Bin 286 -> 282 bytes
 kronolith/themes/default/graphics/search.png                      |  Bin 465 -> 460 bytes
 kronolith/themes/default/graphics/tasks.png                       |  Bin 615 -> 614 bytes
 kronolith/themes/default/graphics/today.png                       |  Bin 481 -> 471 bytes
 kronolith/themes/default/graphics/unknown-background.png          |  Bin 116 -> 115 bytes
 luxor/themes/default/graphics/folder.png                          |  Bin 407 -> 403 bytes
 luxor/themes/default/graphics/parent.png                          |  Bin 424 -> 423 bytes
 mnemo/themes/default/graphics/add.png                             |  Bin 491 -> 486 bytes
 mnemo/themes/default/graphics/az.png                              |  Bin 117 -> 116 bytes
 mnemo/themes/default/graphics/minus.png                           |  Bin 545 -> 532 bytes
 mnemo/themes/default/graphics/mnemo.png                           |  Bin 414 -> 397 bytes
 mnemo/themes/default/graphics/notepads.png                        |  Bin 352 -> 340 bytes
 mnemo/themes/default/graphics/plus.png                            |  Bin 626 -> 618 bytes
 mnemo/themes/default/graphics/search.png                          |  Bin 465 -> 460 bytes
 mnemo/themes/default/graphics/za.png                              |  Bin 119 -> 118 bytes
 nag/themes/default/graphics/add.png                               |  Bin 516 -> 512 bytes
 nag/themes/default/graphics/alarm.png                             |  Bin 479 -> 476 bytes
 nag/themes/default/graphics/alarm_small.png                       |  Bin 266 -> 265 bytes
 nag/themes/default/graphics/az.png                                |  Bin 117 -> 116 bytes
 nag/themes/default/graphics/checkbox.png                          |  Bin 479 -> 477 bytes
 nag/themes/default/graphics/checked.png                           |  Bin 259 -> 258 bytes
 nag/themes/default/graphics/minus.png                             |  Bin 545 -> 532 bytes
 nag/themes/default/graphics/nag.png                               |  Bin 476 -> 465 bytes
 nag/themes/default/graphics/note.png                              |  Bin 414 -> 397 bytes
 nag/themes/default/graphics/plus.png                              |  Bin 626 -> 618 bytes
 nag/themes/default/graphics/search.png                            |  Bin 465 -> 460 bytes
 nag/themes/default/graphics/smart.png                             |  Bin 437 -> 418 bytes
 nag/themes/default/graphics/tasklists.png                         |  Bin 476 -> 465 bytes
 nag/themes/default/graphics/za.png                                |  Bin 119 -> 118 bytes
 operator/themes/default/graphics/graphs.png                       |  Bin 337 -> 313 bytes
 operator/themes/default/graphics/operator.png                     |  Bin 477 -> 475 bytes
 sam/themes/default/graphics/whitelist.png                         |  Bin 167 -> 166 bytes
 sesha/themes/default/graphics/administration.png                  |  Bin 667 -> 656 bytes
 sesha/themes/default/graphics/az.png                              |  Bin 117 -> 116 bytes
 sesha/themes/default/graphics/search.png                          |  Bin 465 -> 460 bytes
 sesha/themes/default/graphics/sesha.png                           |  Bin 366 -> 353 bytes
 sesha/themes/default/graphics/stock.png                           |  Bin 400 -> 387 bytes
 sesha/themes/default/graphics/za.png                              |  Bin 119 -> 118 bytes
 shout/themes/default/graphics/admin.png                           |  Bin 553 -> 551 bytes
 shout/themes/default/graphics/delete-small.png                    |  Bin 135 -> 134 bytes
 shout/themes/default/graphics/device-add.png                      |  Bin 529 -> 525 bytes
 shout/themes/default/graphics/digit-0.png                         |  Bin 1866 -> 1658 bytes
 shout/themes/default/graphics/digit-1.png                         |  Bin 1510 -> 1360 bytes
 shout/themes/default/graphics/digit-2.png                         |  Bin 1290 -> 1270 bytes
 shout/themes/default/graphics/digit-3.png                         |  Bin 1309 -> 1300 bytes
 shout/themes/default/graphics/digit-4.png                         |  Bin 2132 -> 2109 bytes
 shout/themes/default/graphics/digit-5.png                         |  Bin 1931 -> 1906 bytes
 shout/themes/default/graphics/digit-6.png                         |  Bin 2160 -> 2143 bytes
 shout/themes/default/graphics/digit-7.png                         |  Bin 2057 -> 2033 bytes
 shout/themes/default/graphics/digit-8.png                         |  Bin 2167 -> 2136 bytes
 shout/themes/default/graphics/digit-9.png                         |  Bin 2218 -> 2189 bytes
 shout/themes/default/graphics/digit-bg.png                        |  Bin 13214 -> 11892 bytes
 shout/themes/default/graphics/digit-octo.png                      |  Bin 1845 -> 1607 bytes
 shout/themes/default/graphics/digit-star.png                      |  Bin 1671 -> 1506 bytes
 shout/themes/default/graphics/edit.png                            |  Bin 439 -> 425 bytes
 shout/themes/default/graphics/extension-add.png                   |  Bin 665 -> 664 bytes
 shout/themes/default/graphics/extension.png                       |  Bin 661 -> 660 bytes
 shout/themes/default/graphics/shout.png                           |  Bin 477 -> 475 bytes
 shout/themes/default/graphics/telephone-pole.png                  |  Bin 515 -> 512 bytes
 skeleton/themes/default/graphics/delete.png                       |  Bin 412 -> 403 bytes
 trean/themes/default/graphics/add.png                             |  Bin 626 -> 618 bytes
 trean/themes/default/graphics/http/1xx.png                        |  Bin 610 -> 599 bytes
 trean/themes/default/graphics/http/2xx.png                        |  Bin 604 -> 599 bytes
 trean/themes/default/graphics/http/3xx.png                        |  Bin 610 -> 599 bytes
 trean/themes/default/graphics/http/4xx.png                        |  Bin 548 -> 538 bytes
 trean/themes/default/graphics/http/5xx.png                        |  Bin 545 -> 532 bytes
 trean/themes/default/graphics/http/error.png                      |  Bin 545 -> 532 bytes
 trean/themes/default/graphics/protocol/ftp.png                    |  Bin 422 -> 401 bytes
 trean/themes/default/graphics/protocol/http.png                   |  Bin 646 -> 639 bytes
 trean/themes/default/graphics/protocol/https.png                  |  Bin 451 -> 429 bytes
 trean/themes/default/graphics/tag.png                             |  Bin 395 -> 333 bytes
 trean/themes/default/graphics/trean.png                           |  Bin 292 -> 284 bytes
 turba/docs/CHANGES                                                |    2 +
 turba/js/smartmobile.js                                           |   35 +++--
 turba/package.xml                                                 |    2 +
 turba/test/Turba/fixtures/az.png                                  |  Bin 117 -> 116 bytes
 turba/themes/default/graphics/az.png                              |  Bin 117 -> 116 bytes
 turba/themes/default/graphics/az_secondary.png                    |  Bin 129 -> 128 bytes
 turba/themes/default/graphics/contact.png                         |  Bin 500 -> 497 bytes
 turba/themes/default/graphics/delete.png                          |  Bin 412 -> 403 bytes
 turba/themes/default/graphics/edit.png                            |  Bin 439 -> 425 bytes
 turba/themes/default/graphics/group.png                           |  Bin 609 -> 601 bytes
 turba/themes/default/graphics/menu/browse.png                     |  Bin 537 -> 535 bytes
 turba/themes/default/graphics/menu/new.png                        |  Bin 583 -> 576 bytes
 turba/themes/default/graphics/mime/vcard.png                      |  Bin 444 -> 431 bytes
 turba/themes/default/graphics/new.png                             |  Bin 583 -> 576 bytes
 turba/themes/default/graphics/search.png                          |  Bin 465 -> 460 bytes
 turba/themes/default/graphics/turba.png                           |  Bin 426 -> 425 bytes
 turba/themes/default/graphics/za.png                              |  Bin 119 -> 118 bytes
 turba/themes/default/graphics/za_secondary.png                    |  Bin 130 -> 128 bytes
 ulaform/themes/default/graphics/display.png                       |  Bin 253 -> 251 bytes
 ulaform/themes/default/graphics/ulaform.png                       |  Bin 253 -> 251 bytes
 vilma/themes/default/graphics/display.png                         |  Bin 177 -> 176 bytes
 vilma/themes/default/graphics/domain.png                          |  Bin 727 -> 725 bytes
 vilma/themes/default/graphics/vilma.png                           |  Bin 263 -> 262 bytes
 whups/themes/default/graphics/az.png                              |  Bin 117 -> 116 bytes
 whups/themes/default/graphics/reports.png                         |  Bin 194 -> 191 bytes
 whups/themes/default/graphics/search.png                          |  Bin 424 -> 423 bytes
 whups/themes/default/graphics/whups.png                           |  Bin 351 -> 350 bytes
 whups/themes/default/graphics/za.png                              |  Bin 119 -> 118 bytes
 wicked/themes/default/graphics/az.png                             |  Bin 117 -> 116 bytes
 wicked/themes/default/graphics/locked.png                         |  Bin 505 -> 503 bytes
 wicked/themes/default/graphics/question.png                       |  Bin 116 -> 115 bytes
 wicked/themes/default/graphics/za.png                             |  Bin 119 -> 118 bytes
 705 files changed, 39 insertions(+), 16 deletions(-)

http://git.horde.org/horde-git/-/commit/30b7243e0bd9c5d295f8b783da2bff2428d03861

-----------------------------------------------------------------------

commit b5e92faff6db24e7f734a735b3922a9aafec4645
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Apr 2 16:21:21 2013 -0600

    Commented out value should be the value to trigger the described activity

 imp/config/prefs.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/b5e92faff6db24e7f734a735b3922a9aafec4645

-----------------------------------------------------------------------

commit bef44e38ce801a3839f9b4c580c99b13f22a0309
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Apr 2 17:22:52 2013 -0600

    Fix delivering address/subject information to dynamic compose window.

 imp/js/compose-dimp.js      |   18 +++++++++-------
 imp/lib/Dynamic/Compose.php |   44 ++++++++++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 23 deletions(-)

http://git.horde.org/horde-git/-/commit/bef44e38ce801a3839f9b4c580c99b13f22a0309

-----------------------------------------------------------------------

commit c34fba5284697a7135b026cb905dbd678d786952
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Apr 2 17:27:49 2013 -0600

    Simpler way of hiding upload widget

 imp/themes/default/dynamic/screen.css |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/c34fba5284697a7135b026cb905dbd678d786952

-----------------------------------------------------------------------

commit c97daf21e5e3b02294ee71a84d0a8646920d05fe
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Apr 2 17:44:26 2013 -0600

    Fix scrolling of ITIP data in the compose_attach preview in dynamic mode

 imp/lib/Basic/Search.php              |    2 +-
 imp/lib/Basic/Thread.php              |    2 +-
 imp/lib/Mime/Viewer/Itip.php          |    4 +++-
 imp/themes/default/dynamic/screen.css |    2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/c97daf21e5e3b02294ee71a84d0a8646920d05fe

-----------------------------------------------------------------------

commit de41ea8a2e1dd01586b5b9adcb80256a3e85f938
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Apr 2 18:11:44 2013 -0600

    Improve waiting behavior when importing a mailbox file
    
    This is blocking at the server level anyway, so allowing the user to
    perform other actions doesn't get us anything.

 imp/js/dimpbase.js          |    3 ++-
 imp/lib/Dynamic/Mailbox.php |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/de41ea8a2e1dd01586b5b9adcb80256a3e85f938

-----------------------------------------------------------------------

commit 9ba745c6e6f3e02bd603410f42f892becc5664c2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Apr 2 21:50:14 2013 -0600

    This needs an argument.

 imp/lib/Ajax/Application/Compose.php |    4 +++-
 imp/lib/Dynamic/Compose.php          |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/9ba745c6e6f3e02bd603410f42f892becc5664c2

-----------------------------------------------------------------------

commit 159462f39a9233ecc7b0cd5d69b794188b957795
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Apr 2 23:21:48 2013 -0600

    [mms] Allow attachments to be dragged/dropped from local filesystem on the dyanmic compose page.
    
    Bonus: convert the drag/drop HTML image feature to use the new
    attachment AJAX POST code (rather than the much less efficient Data URL
    upload code)

 imp/docs/CHANGES                                   |    2 +
 imp/js/ckeditor/pasteattachment.js                 |   35 ++++---------------
 imp/js/compose-dimp.js                             |   32 ++++++++++++++++++
 imp/lib/Ajax/Application/Handler/ComposeAttach.php |    9 ++---
 imp/package.xml                                    |    1 +
 imp/templates/dynamic/compose.html.php             |    2 +-
 6 files changed, 48 insertions(+), 33 deletions(-)

http://git.horde.org/horde-git/-/commit/159462f39a9233ecc7b0cd5d69b794188b957795

-----------------------------------------------------------------------

commit 0d6566e132c47d378d1858437c0630346c64b02f
Merge: 159462f 7c10b48
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Apr 3 11:29:10 2013 -0400

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/package.xml

 framework/Prefs/package.xml                  |    7 +++++++
 imp/docs/CHANGES                             |    1 +
 imp/js/dimpbase.js                           |    1 -
 imp/lib/Ajax/Application/Handler/Dynamic.php |    7 ++++---
 imp/package.xml                              |    1 +
 5 files changed, 13 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/0d6566e132c47d378d1858437c0630346c64b02f

-----------------------------------------------------------------------

commit f4ee345788b6ff5af1aca4a0254cf39d1ff11b2a
Merge: 0d6566e dcb2d11
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Apr 3 16:13:14 2013 -0400

    Merge branch 'master' into imp_6_1

 framework/ActiveSync/lib/Horde/ActiveSync.php                     |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php |    9 +-
 framework/ActiveSync/package.xml                                  |    4 +
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |    6 +-
 framework/Crypt/lib/Horde/Crypt/Pgp.php                           |   11 +-
 framework/Crypt/package.xml                                       |    2 +
 framework/Crypt/test/Horde/Crypt/PgpTest.php                      |    2 +
 framework/Image/test/Horde/Image/Exif/ExiftoolTest.php            |   15 +--
 framework/Image/test/Horde/Image/Exif/PhpTest.php                 |   12 ++-
 framework/Image/test/Horde/Image/Exif/TestBase.php                |    9 ++-
 framework/Mime/test/Horde/Mime/MailTest.php                       |    2 +
 framework/Push/test/Horde/Push/Unit/Push/Recipient/MailTest.php   |   10 +-
 .../test/Horde/SessionHandler/Storage/MemcacheTest.php            |    5 +-
 .../test/Horde/SessionHandler/Storage/StackTest.php               |   28 ++---
 framework/Vfs/test/Horde/Vfs/FileTest.php                         |   12 +--
 15 files changed, 73 insertions(+), 57 deletions(-)

http://git.horde.org/horde-git/-/commit/f4ee345788b6ff5af1aca4a0254cf39d1ff11b2a

-----------------------------------------------------------------------

commit 7d0ced88c5bf59a49d1d2f32f060ba60a0a3c7ef
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Apr 3 00:47:35 2013 -0600

    Provide SSL/TLS information in test script

 imp/lib/Test.php                  |   19 ++++++++++++++++---
 imp/templates/test/mailserver.inc |    5 ++---
 2 files changed, 18 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/7d0ced88c5bf59a49d1d2f32f060ba60a0a3c7ef

-----------------------------------------------------------------------

commit b86c43234a2f2c0a0a9f7e8c276480b0cef5a965
Merge: 7d0ced8 a32b5c0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Apr 4 10:43:51 2013 -0400

    Merge branch 'master' into imp_6_1

 components/lib/Components/Helper/Website.php            |    3 +
 components/lib/Components/Release/Task/Package.php      |    7 +
 framework/ActiveSync/lib/Horde/ActiveSync.php           |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php |    2 +-
 framework/Argv/doc/Horde/Argv/ADVANCED                  |   46 ++++---
 framework/Argv/doc/Horde/Argv/CALLBACKS                 |   38 +++---
 framework/Argv/doc/Horde/Argv/EXTEND                    |   26 ++--
 framework/Argv/doc/Horde/Argv/README                    |   51 ++++----
 framework/Argv/package.xml                              |   34 ++++-
 framework/Argv/test/Horde/Argv/TestCase.php             |    7 +-
 framework/Crypt/package.xml                             |    4 +-
 framework/Itip/test/Horde/Itip/Integration/ItipTest.php |   11 ++-
 framework/Mime/test/Horde/Mime/MailTest.php             |    4 +-
 framework/Util/test/Horde/Util/StringTest.php           |    5 +
 framework/Vfs/test/Horde/Vfs/FileTest.php               |   31 +----
 mnemo/templates/memo/memo.inc                           |    2 +-
 wicked/docs/CHANGES                                     |    2 -
 wicked/lib/Page.php                                     |   34 ++++-
 wicked/lib/Text_Wiki/Parse/Default/Heading2.php         |   16 +++
 wicked/lib/Text_Wiki/Render/Latex/Heading2.php          |    7 +
 wicked/lib/Text_Wiki/Render/Plain/Heading2.php          |    7 +
 wicked/lib/Text_Wiki/Render/Rst/Heading.php             |  103 ---------------
 wicked/lib/Text_Wiki/Render/Rst/Heading2.php            |  103 +++++++++++++++
 wicked/lib/Text_Wiki/Render/Rst/List.php                |    5 +-
 wicked/lib/Text_Wiki/Render/Xhtml/Heading2.php          |    7 +
 wicked/package.xml                                      |   23 +++-
 26 files changed, 347 insertions(+), 234 deletions(-)

http://git.horde.org/horde-git/-/commit/b86c43234a2f2c0a0a9f7e8c276480b0cef5a965

-----------------------------------------------------------------------

commit 445728bae35b80dd30b74e1caf7bea3484771be8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 4 23:54:52 2013 -0600

    Fix adding address to image unblock list

 imp/lib/Ajax/Application/Handler/ImageUnblock.php |    6 +++---
 imp/lib/Mime/Viewer/Html.php                      |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/445728bae35b80dd30b74e1caf7bea3484771be8

-----------------------------------------------------------------------

commit 4f7b11f876ff7ddfe7ad9b343c28b318f04c3981
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 5 01:42:57 2013 -0600

    Fix undefined error

 imp/lib/Ajax/Application/Compose.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/4f7b11f876ff7ddfe7ad9b343c28b318f04c3981

-----------------------------------------------------------------------

commit 74b511db969ddc12bd08a5d5af3e80fb8c6bb100
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 5 01:43:17 2013 -0600

    fix key value

 imp/lib/Ajax/Imple/ImportEncryptKey.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/74b511db969ddc12bd08a5d5af3e80fb8c6bb100

-----------------------------------------------------------------------

commit 03fcc1423b29f1b222357720193c1ebca28ed056
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 5 02:32:12 2013 -0600

    Various coding style fixes

 imp/lib/Ajax/Application/ListMessages.php         |    4 +-
 imp/lib/Basic/Compose.php                         |    2 +-
 imp/lib/Basic/Mailbox.php                         |   26 +++++++++---------
 imp/lib/Compose.php                               |    7 ++---
 imp/lib/Contents.php                              |    7 ++---
 imp/lib/Filter.php                                |    2 +-
 imp/lib/Imap.php                                  |    4 +--
 imp/lib/Imap/Acl.php                              |    2 +-
 imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php |    2 +-
 imp/lib/Mailbox.php                               |   29 ++++++++++-----------
 imp/lib/Mailbox/List.php                          |    2 +-
 imp/lib/Mime/Viewer/Html.php                      |    4 +-
 imp/lib/Mime/Viewer/Itip.php                      |    2 +-
 imp/lib/Minimal/Compose.php                       |    2 +-
 imp/lib/Prefs/Sort/Sortpref.php                   |   28 ++++++++++----------
 imp/lib/Prefs/Special/Acl.php                     |    8 +++---
 imp/lib/Prefs/Special/PgpPrivateKey.php           |    2 +-
 imp/lib/Prefs/Special/Searches.php                |    2 +-
 imp/lib/Quota/Ui.php                              |    2 +-
 imp/lib/Smartmobile.php                           |    2 +-
 imp/lib/Spam.php                                  |    2 +-
 imp/lib/Test.php                                  |    1 -
 22 files changed, 68 insertions(+), 74 deletions(-)

http://git.horde.org/horde-git/-/commit/03fcc1423b29f1b222357720193c1ebca28ed056

-----------------------------------------------------------------------

commit b81e0243edf431be45184083ed07bdddfd24229c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 5 14:44:23 2013 -0600

    Can't call reset() on virtual property

 imp/lib/Ajax/Application/Handler/ImageUnblock.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/b81e0243edf431be45184083ed07bdddfd24229c

-----------------------------------------------------------------------

commit dc5f2f9cfda9ae3662cf9acd19a3ca3ff0a91281
Merge: b81e024 90c805e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Apr 5 17:28:32 2013 -0600

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Compose.php

 .../Cache/migration/Horde/Cache/1_horde_cache_base_tables.php     |    5 ++
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |    6 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Url.php               |    1 -
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php       |   10 +++++
 framework/Util/test/Horde/Util/UtilTest.php                       |    3 +
 horde/lib/Application.php                                         |    5 ++-
 horde/lib/View/Sidebar.php                                        |    2 +-
 horde/lib/View/Topbar.php                                         |    2 +-
 8 files changed, 27 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/dc5f2f9cfda9ae3662cf9acd19a3ca3ff0a91281

-----------------------------------------------------------------------

commit 1ed696e0315d4c690054376be99ab8091a0112e8
Merge: dc5f2f9 0798d0e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Apr 6 22:58:28 2013 -0600

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/package.xml

 horde/docs/CHANGES                     |    2 ++
 horde/package.xml                      |    2 ++
 horde/templates/common/footer.html.php |    1 +
 horde/templates/common/header.html.php |    1 +
 imp/docs/CHANGES                       |    2 ++
 imp/lib/Mailbox.php                    |    8 +++++++-
 imp/package.xml                        |    1 +
 trean/app/controllers/BrowseByTag.php  |    6 ++++++
 trean/browse.php                       |    6 ++++++
 trean/edit.php                         |    6 ++++++
 trean/search.php                       |    6 ++++++
 11 files changed, 40 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/1ed696e0315d4c690054376be99ab8091a0112e8

-----------------------------------------------------------------------

commit c3e031a39eea1a457afe432b73d141d39c99db40
Merge: 1ed696e f86e276
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Apr 7 00:44:14 2013 -0600

    Merge branch 'master' into imp_6_1

 framework/Mime/lib/Horde/Mime/Part.php                            |   53 +++-
 framework/Mime/package.xml                                        |   12 +-
 framework/Mime/test/Horde/Mime/PartTest.php                       |   17 +
 framework/Mime/test/Horde/Mime/fixtures/sample_msg2.txt           |   27 ++
 framework/Support/lib/Horde/Support/CaseInsensitiveArray.php      |   81 +++++
 framework/Support/package.xml                                     |   20 +-
 framework/Support/test/Horde/Support/CaseInsensitiveArrayTest.php |   77 ++++
 7 files changed, 267 insertions(+), 20 deletions(-)

http://git.horde.org/horde-git/-/commit/c3e031a39eea1a457afe432b73d141d39c99db40

-----------------------------------------------------------------------

commit 4f9fe8f70c6d90a4f1ec47b6a972aa852c1e242b
Merge: c3e031a cc10612
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Apr 7 13:02:40 2013 -0600

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/Prefs/Special/Trash.php

 imp/lib/Prefs/Special/Trash.php |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/4f9fe8f70c6d90a4f1ec47b6a972aa852c1e242b

-----------------------------------------------------------------------

commit ba6c76d3ce580e51df7729a32dc2c7f045092e53
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Apr 7 13:03:12 2013 -0600

    No dom load method in this class

 imp/js/folderprefs.js |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/ba6c76d3ce580e51df7729a32dc2c7f045092e53

-----------------------------------------------------------------------

commit 1ed4e5c3e82f2cd7f349d61f61c960454f3d48a5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Apr 7 13:04:16 2013 -0600

    Fix botched merge

 imp/lib/Prefs/Special/Trash.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/1ed4e5c3e82f2cd7f349d61f61c960454f3d48a5

-----------------------------------------------------------------------

commit 2094f307c05534d3a9de976fa935dea958fc120c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 8 00:42:25 2013 -0600

    this needs to be a string

 imp/lib/Ajax/Application/Compose.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/2094f307c05534d3a9de976fa935dea958fc120c

-----------------------------------------------------------------------

commit 4ed2ff00101cc9f6559ff1e3a30f234342ccdfbc
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 8 00:47:02 2013 -0600

    Fix function name

 imp/lib/Basic/Mailbox.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/4ed2ff00101cc9f6559ff1e3a30f234342ccdfbc

-----------------------------------------------------------------------

commit 3fddeb862d2ef9653e0552556d161d8521e42469
Merge: e66c0b4 4ed2ff0
Author: Jan Schneider <jan at horde.org>
Date:   Mon Apr 8 12:03:42 2013 +0200

    Merge branch 'imp_6_1'
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/lib/Ajax/Application/ListMessages.php
    	imp/lib/Dynamic/Mailbox.php
    	imp/package.xml

 framework/Imap_Client/package.xml                                 |    4 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Test/Filter.php            |    2 +-
 .../lib/Horde/Kolab/Server/Object/Kolab/Domainmaintainer.php      |    2 +-
 framework/Mail/lib/Horde/Mail/Transport.php                       |    5 +-
 framework/Mime/lib/Horde/Mime/Part.php                            |   26 +-
 imp/attachment.php                                                |  143 +-
 imp/basic.php                                                     |   45 +
 imp/bin/imp-admin-upgrade                                         |   86 +
 imp/bin/imp-bounce-spam                                           |    6 +-
 imp/bin/imp-mailbox-decode                                        |   14 +-
 imp/bin/imp-query-imap-cache                                      |   86 +-
 imp/compose.php                                                   | 1085 ----
 imp/config/backends.php                                           |  444 +-
 imp/config/conf.xml                                               |  122 +-
 imp/config/filter.txt.dist                                        |    4 -
 imp/config/hooks.php.dist                                         |  365 +-
 imp/config/mime_drivers.php                                       |   10 +-
 imp/config/prefs.php                                              |  151 +-
 imp/contacts.php                                                  |  109 -
 imp/docs/CHANGES                                                  |   77 +
 imp/docs/INSTALL                                                  |   14 +-
 imp/docs/UPGRADING                                                |  145 +
 imp/folders.php                                                   |  452 --
 imp/index.php                                                     |   12 +-
 imp/js/ckeditor/imageupload.js                                    |   56 +
 imp/js/ckeditor/pasteattachment.js                                |   54 +
 imp/js/ckeditor/pasteignore.js                                    |   24 +
 imp/js/compose-base.js                                            |   20 -
 imp/js/compose-dimp.js                                            |  423 +-
 imp/js/compose.js                                                 |   26 +-
 imp/js/contacts.js                                                |    2 +-
 imp/js/dimpbase.js                                                |  526 +-
 imp/js/dimpcore.js                                                |   93 +-
 imp/js/flagprefs.js                                               |   13 +-
 imp/js/folderprefs.js                                             |   16 +-
 imp/js/folders.js                                                 |   30 +-
 imp/js/imp.js                                                     |   31 +-
 imp/js/indices.js                                                 |  121 -
 imp/js/mailbox.js                                                 |   50 +-
 imp/js/message-dimp.js                                            |   74 +-
 imp/js/message.js                                                 |   32 +-
 imp/js/murmurhash3.js                                             |   93 +
 imp/js/pgp.js                                                     |    2 +-
 imp/js/search.js                                                  |   19 +-
 imp/js/searchesprefs.js                                           |    2 +-
 imp/js/signaturehtml.js                                           |    2 +-
 imp/js/smartmobile.js                                             |  945 ++--
 imp/js/viewport.js                                                |   55 +-
 imp/js/viewport_utils.js                                          |   72 +
 imp/lib/Ajax/Application.php                                      |  123 +-
 imp/lib/Ajax/Application/Compose.php                              |   54 +-
 imp/lib/Ajax/Application/Handler/Common.php                       |  188 +-
 imp/lib/Ajax/Application/Handler/ComposeAttach.php                |   96 +
 imp/lib/Ajax/Application/Handler/Draft.php                        |  137 +
 imp/lib/Ajax/Application/Handler/Dynamic.php                      |  351 +-
 imp/lib/Ajax/Application/Handler/ImageUnblock.php                 |   10 +-
 imp/lib/Ajax/Application/Handler/Search.php                       |    2 +-
 imp/lib/Ajax/Application/Handler/Smartmobile.php                  |   32 +-
 imp/lib/Ajax/Application/ListMessages.php                         |  111 +-
 imp/lib/Ajax/Application/ShowMessage.php                          |  121 +-
 imp/lib/Ajax/Imple/ContactAutoCompleter.php                       |    2 +-
 imp/lib/Ajax/Imple/ImportEncryptKey.php                           |   13 +-
 imp/lib/Ajax/Imple/ItipRequest.php                                |   14 +-
 imp/lib/Ajax/Queue.php                                            |  182 +-
 imp/lib/Api.php                                                   |   80 +-
 imp/lib/Application.php                                           |  104 +-
 imp/lib/Auth.php                                                  |  200 +-
 imp/lib/Basic/Base.php                                            |   98 +
 imp/lib/Basic/Compose.php                                         | 1152 ++++
 imp/lib/Basic/Contacts.php                                        |  128 +
 imp/lib/Basic/Folders.php                                         |  464 ++
 imp/lib/Basic/Mailbox.php                                         | 1000 ++++
 imp/lib/Basic/Message.php                                         | 1026 ++++
 imp/lib/Basic/Pgp.php                                             |  220 +
 imp/lib/Basic/Saveimage.php                                       |   90 +
 imp/lib/Basic/Search.php                                          |  528 ++
 imp/lib/Basic/Searchbasic.php                                     |  131 +
 imp/lib/Basic/Smime.php                                           |  218 +
 imp/lib/Basic/Thread.php                                          |  205 +
 imp/lib/Block/Newmail.php                                         |    8 +-
 imp/lib/Block/Summary.php                                         |    5 +-
 imp/lib/Compose.php                                               | 1245 ++---
 imp/lib/Compose/Attachment.php                                    |  220 +
 imp/lib/Compose/Attachment/Linked.php                             |   41 +
 imp/lib/Compose/Attachment/Linked/Metadata.php                    |   93 +
 imp/lib/Compose/Attachment/Storage.php                            |  110 +
 imp/lib/Compose/Attachment/Storage/Vfs.php                        |  104 +
 imp/lib/Compose/Attachment/Storage/VfsLinked.php                  |  176 +
 imp/lib/Compose/Link.php                                          |  152 +
 imp/lib/Compose/LinkedAttachment.php                              |  276 +
 imp/lib/Compose/Ui.php                                            |  146 +
 imp/lib/Compose/View.php                                          |    2 +-
 imp/lib/Contacts.php                                              |   76 +
 imp/lib/Contents.php                                              |  128 +-
 imp/lib/Contents/View.php                                         |   17 +-
 imp/lib/Crypt/Pgp.php                                             |   97 +-
 imp/lib/Crypt/Smime.php                                           |  115 +-
 imp/lib/Dynamic/Base.php                                          |   15 +-
 imp/lib/Dynamic/Compose.php                                       |  131 +-
 imp/lib/Dynamic/Compose/Common.php                                |   71 +-
 imp/lib/Dynamic/Mailbox.php                                       |   76 +-
 imp/lib/Dynamic/Message.php                                       |   41 +-
 imp/lib/Editor.php                                                |   96 +
 imp/lib/Factory/AuthImap.php                                      |   27 +-
 imp/lib/Factory/Compose.php                                       |    5 +-
 imp/lib/Factory/ComposeAtc.php                                    |   82 +
 imp/lib/Factory/Flags.php                                         |   26 +-
 imp/lib/Factory/Imap.php                                          |   80 +-
 imp/lib/Factory/Imaptree.php                                      |   36 +-
 imp/lib/Factory/Mail.php                                          |   63 +-
 imp/lib/Factory/Mailbox.php                                       |   14 +-
 imp/lib/Factory/MailboxList.php                                   |   76 +-
 imp/lib/Factory/Maillog.php                                       |   38 +
 imp/lib/Factory/PrefsSort.php                                     |    2 +-
 imp/lib/Factory/Quota.php                                         |   16 +-
 imp/lib/Factory/Search.php                                        |   26 +-
 imp/lib/Filter.php                                                |   30 +-
 imp/lib/Flag/System/HighPriority.php                              |    2 +-
 imp/lib/Flag/System/LowPriority.php                               |    2 +-
 imp/lib/Flags.php                                                 |    5 +-
 imp/lib/IMP.php                                                   |  436 +--
 imp/lib/Images.php                                                |   78 +
 imp/lib/Imap.php                                                  |  395 +-
 imp/lib/Imap/Acl.php                                              |   85 +-
 imp/lib/Imap/Config.php                                           |  294 +
 imp/lib/Imap/Tree.php                                             |   35 +-
 imp/lib/Indices.php                                               |   52 +-
 imp/lib/Indices/Form.php                                          |   50 -
 imp/lib/Indices/Mailbox.php                                       |  103 +
 imp/lib/LoginTasks/SystemTask/GarbageCollection.php               |   17 +-
 imp/lib/LoginTasks/SystemTask/Upgrade.php                         |   31 +-
 imp/lib/LoginTasks/SystemTask/UpgradeAuth.php                     |    4 +-
 imp/lib/LoginTasks/Task/Autocreate.php                            |    2 +-
 imp/lib/LoginTasks/Task/DeleteAttachmentsMonthly.php              |   36 +-
 imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php                 |    4 +-
 imp/lib/LoginTasks/Task/PurgeSpam.php                             |    5 +-
 imp/lib/LoginTasks/Task/PurgeTrash.php                            |    4 +-
 imp/lib/LoginTasks/Task/RenameSentmailMonthly.php                 |    2 +-
 imp/lib/Mailbox.php                                               |  499 +-
 imp/lib/Mailbox/List.php                                          |  401 +-
 imp/lib/Mailbox/List/Pop3.php                                     |   74 +
 imp/lib/Mailbox/List/Track.php                                    |  262 -
 imp/lib/Mailbox/List/Virtual.php                                  |  190 +
 imp/lib/Mailbox/Ui.php                                            |  189 +
 imp/lib/Maillog.php                                               |   14 +
 imp/lib/Mbox/Generate.php                                         |  153 +
 imp/lib/Mbox/Import.php                                           |  205 +
 imp/lib/Message.php                                               |   88 +-
 imp/lib/Message/Ui.php                                            |  346 ++
 imp/lib/Mime/Headers.php                                          |   53 +
 imp/lib/Mime/Status.php                                           |   51 +-
 imp/lib/Mime/Viewer/Html.php                                      |  167 +-
 imp/lib/Mime/Viewer/Images.php                                    |    7 +-
 imp/lib/Mime/Viewer/Itip.php                                      |   14 +-
 imp/lib/Mime/Viewer/Pdf.php                                       |    2 +-
 imp/lib/Mime/Viewer/Pgp.php                                       |   14 +-
 imp/lib/Mime/Viewer/Plain.php                                     |   22 +-
 imp/lib/Mime/Viewer/Rfc822.php                                    |    2 +-
 imp/lib/Mime/Viewer/Smime.php                                     |   20 +-
 imp/lib/Minimal/Base.php                                          |   14 +-
 imp/lib/Minimal/Compose.php                                       |  132 +-
 imp/lib/Minimal/Folders.php                                       |    2 +-
 imp/lib/Minimal/Mailbox.php                                       |   85 +-
 imp/lib/Minimal/Message.php                                       |  125 +-
 imp/lib/Minimal/Messagepart.php                                   |   24 +-
 imp/lib/Minimal/Search.php                                        |   14 +-
 imp/lib/Notification/Handler/Decorator/ImapAlerts.php             |    4 +-
 imp/lib/Notification/Handler/Decorator/NewmailNotify.php          |    6 +-
 imp/lib/Perms.php                                                 |  145 +
 imp/lib/Prefs/Identity.php                                        |   42 +-
 imp/lib/Prefs/Sort.php                                            |   20 +-
 imp/lib/Prefs/Sort/Fixed.php                                      |   69 -
 imp/lib/Prefs/Sort/FixedDate.php                                  |   34 +
 imp/lib/Prefs/Sort/None.php                                       |   78 +
 imp/lib/Prefs/Sort/Sortpref.php                                   |   50 +-
 imp/lib/Prefs/Sort/Sortpref/Locked.php                            |   37 +
 imp/lib/Prefs/Special/Acl.php                                     |   32 +-
 imp/lib/Prefs/Special/ComposeTemplates.php                        |   28 +-
 imp/lib/Prefs/Special/Drafts.php                                  |   24 +-
 imp/lib/Prefs/Special/Encrypt.php                                 |   20 +-
 imp/lib/Prefs/Special/Flag.php                                    |   20 +-
 imp/lib/Prefs/Special/HtmlSignature.php                           |   22 +-
 imp/lib/Prefs/Special/ImageReplacement.php                        |   20 +-
 imp/lib/Prefs/Special/InitialPage.php                             |   20 +-
 imp/lib/Prefs/Special/Mailto.php                                  |   22 +-
 imp/lib/Prefs/Special/NewmailSound.php                            |   20 +-
 imp/lib/Prefs/Special/PgpPrivateKey.php                           |   55 +-
 imp/lib/Prefs/Special/PgpPublicKey.php                            |   22 +-
 imp/lib/Prefs/Special/Searches.php                                |   24 +-
 imp/lib/Prefs/Special/Sentmail.php                                |   30 +-
 imp/lib/Prefs/Special/SmimePrivateKey.php                         |   22 +-
 imp/lib/Prefs/Special/SmimePublicKey.php                          |   22 +-
 imp/lib/Prefs/Special/Sourceselect.php                            |   22 +-
 imp/lib/Prefs/Special/Spam.php                                    |   26 +-
 imp/lib/Prefs/Special/SpecialMboxes.php                           |   24 +-
 imp/lib/Prefs/Special/Trash.php                                   |   28 +-
 imp/lib/Quota.php                                                 |    6 +-
 imp/lib/Quota/Command.php                                         |    8 +-
 imp/lib/Quota/Hook.php                                            |    8 +-
 imp/lib/Quota/Imap.php                                            |   21 +-
 imp/lib/Quota/Maildir.php                                         |    8 +-
 imp/lib/Quota/Mdaemon.php                                         |   10 +-
 imp/lib/Quota/Mercury32.php                                       |   12 +-
 imp/lib/Quota/Null.php                                            |    8 +-
 imp/lib/Quota/Sql.php                                             |   12 +-
 imp/lib/Quota/Ui.php                                              |   84 +
 imp/lib/Script/Package/ComposeBase.php                            |   28 +
 imp/lib/Search.php                                                |    5 +-
 imp/lib/Search/Ui.php                                             |   68 +
 imp/lib/Smartmobile.php                                           |   67 +-
 imp/lib/Spam.php                                                  |  247 +-
 imp/lib/Test.php                                                  |   18 +-
 imp/lib/Tree/Flist.php                                            |   10 +-
 imp/lib/Ui/Compose.php                                            |  248 -
 imp/lib/Ui/Contacts.php                                           |   68 -
 imp/lib/Ui/Editor.php                                             |   88 -
 imp/lib/Ui/Folder.php                                             |  170 -
 imp/lib/Ui/Headers.php                                            |   45 -
 imp/lib/Ui/Imageview.php                                          |   71 -
 imp/lib/Ui/Mailbox.php                                            |  195 -
 imp/lib/Ui/Message.php                                            |  404 --
 imp/lib/Ui/Quota.php                                              |   74 -
 imp/lib/Ui/Search.php                                             |   60 -
 imp/lib/View/Subinfo.php                                          |   40 +-
 imp/locale/en/help.xml                                            |    7 -
 imp/mailbox.php                                                   |  987 ----
 imp/message.php                                                   |  941 ----
 imp/package.xml                                                   |  325 +-
 imp/pgp.php                                                       |  111 -
 imp/rss.php                                                       |   12 +-
 imp/saveimage.php                                                 |   70 -
 imp/search-basic.php                                              |  118 -
 imp/search.php                                                    |  511 --
 imp/smartmobile.php                                               |    2 +-
 imp/smime.php                                                     |  102 -
 imp/templates/basic/compose/compose.html.php                      |   23 +-
 imp/templates/basic/compose/redirect.html.php                     |    2 -
 imp/templates/basic/flist/flist.html.php                          |    2 +-
 imp/templates/basic/mailbox/actions.html.php                      |    4 +-
 imp/templates/basic/mailbox/form_start.html.php                   |    3 +-
 imp/templates/basic/mailbox/mailbox.html.php                      |    4 +-
 imp/templates/basic/mailbox/navbar.html.php                       |    5 +-
 imp/templates/basic/message/navbar_actions.html.php               |    4 +-
 imp/templates/basic/message/navbar_top.html.php                   |    4 +-
 imp/templates/basic/search/search-basic.html.php                  |    1 -
 imp/templates/contacts/contacts.html.php                          |    1 -
 imp/templates/dynamic/compose.html.php                            |   57 +-
 imp/templates/dynamic/header.html.php                             |    6 +-
 imp/templates/dynamic/mailbox.html.php                            |    2 +-
 imp/templates/minimal/compose.html.php                            |    3 +
 imp/templates/minimal/mailbox.html.php                            |    8 +-
 imp/templates/minimal/menu.html.php                               |    5 +-
 imp/templates/pgp/import_key.html.php                             |    1 -
 imp/templates/prefs/composetemplates.html.php                     |    2 +-
 imp/templates/prefs/drafts.html.php                               |    2 +-
 imp/templates/prefs/pgpprivatekey.html.php                        |   14 -
 imp/templates/prefs/searches.html.php                             |    4 -
 imp/templates/prefs/sentmail.html.php                             |    2 +-
 imp/templates/prefs/spam.html.php                                 |    2 +-
 imp/templates/prefs/trash.html.php                                |    2 +-
 imp/templates/saveimage/saveimage.html.php                        |    3 +-
 imp/templates/search/search.html.php                              |    2 +-
 imp/templates/smartmobile/compose.html.php                        |   44 +-
 imp/templates/smartmobile/confirm.html.php                        |   10 -
 imp/templates/smartmobile/copymove.html.php                       |    4 +-
 imp/templates/smartmobile/folders.html.php                        |    2 +-
 imp/templates/smartmobile/mailbox.html.php                        |    8 +-
 imp/templates/smartmobile/message.html.php                        |   65 +-
 imp/templates/smartmobile/search.html.php                         |    1 -
 imp/templates/smime/import_key.html.php                           |    1 -
 imp/templates/test/mailserver.inc                                 |    5 +-
 imp/test/Imp/Autoload.php                                         |    1 +
 imp/test/Imp/Stub/HtmlViewer.php                                  |    4 +-
 imp/test/Imp/Unit/ComposeTest.php                                 |    5 +-
 imp/test/Imp/Unit/MboxParseTest.php                               |    1 +
 imp/test/Imp/Unit/Mime/Viewer/HtmlTest.php                        |   11 +-
 imp/test/Imp/Unit/Mime/Viewer/ItipTest.php                        |   24 +-
 imp/test/Imp/Unit/QuotaTest.php                                   |    3 +-
 imp/test/Imp/Unit/ReferencesTest.php                              |    1 +
 imp/themes/default/dynamic/screen.css                             |   58 +-
 imp/themes/default/screen.css                                     |    5 +-
 imp/themes/default/smartmobile/screen.css                         |   29 +-
 imp/thread.php                                                    |  204 -
 imp/view.php                                                      |    8 +-
 284 files changed, 15933 insertions(+), 13029 deletions(-)

http://git.horde.org/horde-git/-/commit/3fddeb862d2ef9653e0552556d161d8521e42469




More information about the commits mailing list