[commits] Horde branch master updated. 7a99cdc0d345aa5b5e3dfc09ae0a7b1e23cd0550

Jan Schneider jan at horde.org
Tue Dec 17 11:53:06 UTC 2013


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

from: c0f3c4627ed315927a88c155b8c05f1f23ed0e13

d58aac5 Allow passing in a bookmark creation date when creating a bookmark.
e31eb30 First stab at importing bookmarks.
fff30c5 Cleanup/existence checks etc...
33b4e38 Allow crawling to be disabled when creating a new bookmark.
57234d1 Actually echo the output.
cce0d26 Add link for import page.
e57fd27 Ignore mozilla's "smart" bookmarks.
4b5a58b There is no "next" step, name this accordingly.
6d8565d update package.xml/changes
2c8383f Fix version.
232b263 Merge branch 'master' into trean_1_1
fce4dc3 Merge branch 'master' into trean_1_1
697675a Fix changelogs.
b82cd46 Merge branch 'master' into trean_1_1
274d443 Cache Facebook queries for timeobject events.
064d893 changes
baaa690 Need to include the username in the cache key.
0b4fc5e Merge branch 'timeobjects_2_1'
7a99cdc Merge branch 'trean_1_1'

Summary: http://github.com/horde/horde/compare/c0f3c4627ed315927a88c155b8c05f1f23ed0e13...7a99cdc0d345aa5b5e3dfc09ae0a7b1e23cd0550

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

commit d58aac5511831b7c4f788ff8282eba8e8ef4ca9b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 00:16:30 2013 -0400

    Allow passing in a bookmark creation date when creating a bookmark.

 trean/lib/Bookmarks.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/d58aac5511831b7c4f788ff8282eba8e8ef4ca9b
http://git.horde.org/horde-git/-/commit/d58aac5511831b7c4f788ff8282eba8e8ef4ca9b

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

commit e31eb30aa44e3e3d0f003a728da92d0278fea423
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 00:17:58 2013 -0400

    First stab at importing bookmarks.
    
    Adds an importer for the JSON format used by Firefox/Mozilla. Creates tags
    for each parent folder in the bookmark hierarchy exported by Firefox. The
    crawl task seems to take *forever* though - might need to turn this off for
    imports? Thought this shouldn't run until after the request is complete?
    
    Conflicts:
    	trean/lib/Application.php
    	trean/package.xml

 trean/data.php                  |  101 ++++++++++++++++++++++++++++++++++++
 trean/lib/Application.php       |    8 +++
 trean/lib/Data/Json.php         |  109 +++++++++++++++++++++++++++++++++++++++
 trean/package.xml               |    6 ++
 trean/templates/data/import.inc |   25 +++++++++
 5 files changed, 249 insertions(+), 0 deletions(-)
 create mode 100644 trean/data.php
 create mode 100644 trean/lib/Data/Json.php
 create mode 100644 trean/templates/data/import.inc

http://github.com/horde/horde/commit/e31eb30aa44e3e3d0f003a728da92d0278fea423
http://git.horde.org/horde-git/-/commit/e31eb30aa44e3e3d0f003a728da92d0278fea423

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

commit fff30c56b3fbdbc5dc960a855ce6b9ca88a01800
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 00:48:13 2013 -0400

    Cleanup/existence checks etc...

 trean/data.php          |    6 +++---
 trean/lib/Data/Json.php |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/fff30c56b3fbdbc5dc960a855ce6b9ca88a01800
http://git.horde.org/horde-git/-/commit/fff30c56b3fbdbc5dc960a855ce6b9ca88a01800

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

commit 33b4e383639337d874e7ee39b162aaf0db5c2b76
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 01:07:11 2013 -0400

    Allow crawling to be disabled when creating a new bookmark.
    
    Needed, for now, when importing bookmarks since this takes forever
    and seems to randomly kill the browser connection.

 trean/data.php          |    2 +-
 trean/lib/Bookmarks.php |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/33b4e383639337d874e7ee39b162aaf0db5c2b76
http://git.horde.org/horde-git/-/commit/33b4e383639337d874e7ee39b162aaf0db5c2b76

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

commit 57234d1c241554dd030b5eba56900dacc2387b1c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 01:11:49 2013 -0400

    Actually echo the output.

 trean/templates/data/import.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/57234d1c241554dd030b5eba56900dacc2387b1c
http://git.horde.org/horde-git/-/commit/57234d1c241554dd030b5eba56900dacc2387b1c

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

commit cce0d2693e7d44d6f17c44276c6ab0fd12d2ead9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 01:34:27 2013 -0400

    Add link for import page.

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

http://github.com/horde/horde/commit/cce0d2693e7d44d6f17c44276c6ab0fd12d2ead9
http://git.horde.org/horde-git/-/commit/cce0d2693e7d44d6f17c44276c6ab0fd12d2ead9

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

commit e57fd2764cb0eed4d4dc0da83a810927b0a229dc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 01:34:47 2013 -0400

    Ignore mozilla's "smart" bookmarks.

 trean/lib/Data/Json.php |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/e57fd2764cb0eed4d4dc0da83a810927b0a229dc
http://git.horde.org/horde-git/-/commit/e57fd2764cb0eed4d4dc0da83a810927b0a229dc

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

commit 4b5a58bc7d2fdfa6d10a3c999661702d942de309
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 01:35:05 2013 -0400

    There is no "next" step, name this accordingly.

 trean/templates/data/import.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/4b5a58bc7d2fdfa6d10a3c999661702d942de309
http://git.horde.org/horde-git/-/commit/4b5a58bc7d2fdfa6d10a3c999661702d942de309

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

commit 6d8565de85bbc2361f00eb4283be8e6a0419935f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 11:48:26 2013 -0400

    update package.xml/changes

 trean/docs/CHANGES |    8 +++++++-
 trean/package.xml  |   15 +++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

http://github.com/horde/horde/commit/6d8565de85bbc2361f00eb4283be8e6a0419935f
http://git.horde.org/horde-git/-/commit/6d8565de85bbc2361f00eb4283be8e6a0419935f

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

commit 2c8383f1a91b8a43610b80ab9b1003e28c8c2573
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 8 11:59:12 2013 -0400

    Fix version.
    
    This is just not my day....

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

http://github.com/horde/horde/commit/2c8383f1a91b8a43610b80ab9b1003e28c8c2573
http://git.horde.org/horde-git/-/commit/2c8383f1a91b8a43610b80ab9b1003e28c8c2573

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

commit 232b26328ae0f0622714985f2207a61d46e7e4be
Merge: 2c8383f ebfe54e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Aug 8 18:24:05 2013 -0400

    Merge branch 'master' into trean_1_1
    
    Conflicts:
    	trean/docs/CHANGES
    	trean/package.xml

 agora/locale/de/LC_MESSAGES/agora.mo                              |  Bin 81869 -> 81870 bytes
 agora/locale/hu/LC_MESSAGES/agora.mo                              |  Bin 83173 -> 77371 bytes
 ansel/docs/CHANGES                                                |    6 +
 ansel/docs/RELEASE_NOTES                                          |   14 +-
 ansel/lib/Widget/ImageFaces.php                                   |    2 +-
 ansel/locale/ansel.pot                                            |  110 +-
 ansel/locale/de/LC_MESSAGES/ansel.mo                              |  Bin 106866 -> 106904 bytes
 ansel/locale/de/LC_MESSAGES/ansel.po                              |  110 +-
 ansel/locale/es/LC_MESSAGES/ansel.mo                              |  Bin 106043 -> 106166 bytes
 ansel/locale/es/LC_MESSAGES/ansel.po                              |  138 +-
 ansel/package.xml                                                 |   26 +-
 bundles/groupware/docs/CHANGES                                    |  224 +-
 bundles/groupware/docs/RELEASE_NOTES                              |   45 +-
 bundles/groupware/lib/Bundle.php                                  |    6 +-
 bundles/groupware/package.xml                                     |   35 +-
 bundles/webmail/docs/CHANGES                                      |  277 +-
 bundles/webmail/docs/RELEASE_NOTES                                |   70 +-
 bundles/webmail/lib/Bundle.php                                    |    2 +-
 bundles/webmail/package.xml                                       |   39 +-
 chora/co.php                                                      |   15 +-
 chora/commit.php                                                  |   10 +-
 chora/diff.php                                                    |   10 +-
 chora/docs/CHANGES                                                |    1 +
 chora/locale/chora.pot                                            |  195 +-
 chora/locale/de/LC_MESSAGES/chora.mo                              |  Bin 72009 -> 71704 bytes
 chora/locale/de/LC_MESSAGES/chora.po                              |  211 +-
 chora/locale/es/LC_MESSAGES/chora.mo                              |  Bin 71446 -> 71070 bytes
 chora/locale/es/LC_MESSAGES/chora.po                              |  207 +-
 chora/package.xml                                                 |    2 +
 components/lib/Components/Release/Task/Package.php                |    4 +-
 content/docs/CHANGES                                              |   15 +-
 content/lib/Application.php                                       |    2 +-
 content/package.xml                                               |   23 +-
 folks/lib/Friends.php                                             |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |   25 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php         |    7 +
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php  |   75 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |   30 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php        |    4 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Mail.php        |    2 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/SendMail.php    |    7 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php      |    6 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php   |    5 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php   |    2 -
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |   63 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/SyncBase.php    |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |  113 +-
 framework/ActiveSync/locale/es/LC_MESSAGES/Horde_ActiveSync.mo    |  Bin 1396 -> 1396 bytes
 framework/ActiveSync/locale/es/LC_MESSAGES/Horde_ActiveSync.po    |   16 +-
 .../Horde/ActiveSync/18_horde_activesync_addmapdeleteflag.php     |   17 +
 .../Horde/ActiveSync/19_horde_activesync_addtimestamp.php         |   16 +
 framework/ActiveSync/package.xml                                  |   87 +-
 framework/Auth/lib/Horde/Auth/Imap.php                            |   18 +-
 framework/Auth/package.xml                                        |   38 +-
 framework/Autoloader_Cache/bin/horde-autoloader-cache-prune       |   19 +-
 framework/Autoloader_Cache/lib/Horde/Autoloader/Cache.php         |  126 +-
 framework/Autoloader_Cache/package.xml                            |   26 +-
 framework/Browser/lib/Horde/Browser.php                           |    3 +-
 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/Browser/locale/es/LC_MESSAGES/Horde_Browser.mo          |  Bin 1396 -> 1396 bytes
 framework/Browser/locale/es/LC_MESSAGES/Horde_Browser.po          |   14 +-
 framework/Cache/lib/Horde/Cache/Storage/File.php                  |    3 +-
 framework/Cache/package.xml                                       |   23 +-
 framework/Cli/locale/Horde_Cli.pot                                |   12 +-
 framework/Cli/locale/de/LC_MESSAGES/Horde_Cli.mo                  |  Bin 708 -> 708 bytes
 framework/Cli/locale/de/LC_MESSAGES/Horde_Cli.po                  |   12 +-
 framework/Cli/locale/es/LC_MESSAGES/Horde_Cli.mo                  |  Bin 763 -> 763 bytes
 framework/Cli/locale/es/LC_MESSAGES/Horde_Cli.po                  |   12 +-
 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/locale/es/LC_MESSAGES/Horde_Compress.mo        |  Bin 982 -> 982 bytes
 framework/Compress/locale/es/LC_MESSAGES/Horde_Compress.po        |    8 +-
 framework/Compress/package.xml                                    |   21 +-
 framework/Compress_Fast/package.xml                               |   20 +-
 framework/Core/js/smartmobile.js                                  |    2 +-
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php            |    8 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   60 +-
 framework/Core/lib/Horde/Core/Auth/Imsp.php                       |   21 +-
 framework/Core/lib/Horde/Core/Factory/Cache.php                   |    4 +-
 framework/Core/lib/Horde/Core/Factory/DavServer.php               |    1 +
 framework/Core/lib/Horde/Core/Factory/HashTable.php               |    2 +-
 framework/Core/lib/Horde/Core/Factory/Memcache.php                |    2 +-
 framework/Core/lib/Horde/Core/Factory/SessionHandler.php          |    2 +-
 framework/Core/lib/Horde/Core/HashTable/Wrapper.php               |   54 +
 framework/Core/lib/Horde/Core/Imsp/Utils.php                      |   18 +-
 .../Core/lib/Horde/Core/Notification/Handler/Decorator/Base.php   |   19 +-
 framework/Core/lib/Horde/ErrorHandler.php                         |   15 +-
 framework/Core/lib/Horde/Registry.php                             |    3 +-
 framework/Core/lib/Horde/Themes/Css.php                           |   12 +-
 framework/Core/locale/Horde_Core.pot                              |   45 +-
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.mo                |  Bin 20259 -> 20259 bytes
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.po                |   42 +-
 framework/Core/locale/es/LC_MESSAGES/Horde_Core.mo                |  Bin 20036 -> 20070 bytes
 framework/Core/locale/es/LC_MESSAGES/Horde_Core.po                |   86 +-
 framework/Core/locale/hu/LC_MESSAGES/Horde_Core.mo                |  Bin 11129 -> 10775 bytes
 framework/Core/locale/hu/LC_MESSAGES/Horde_Core.po                |  842 +-
 framework/Core/package.xml                                        |  104 +-
 framework/Core/test/Horde/Core/RegistryTest.php                   |   15 +-
 framework/Core/test/Horde/Core/Stub/Registry.php                  |   16 +-
 framework/Crypt/locale/Horde_Crypt.pot                            |   10 +-
 framework/Crypt/locale/de/LC_MESSAGES/Horde_Crypt.mo              |  Bin 7765 -> 7751 bytes
 framework/Crypt/locale/de/LC_MESSAGES/Horde_Crypt.po              |   14 +-
 framework/Crypt/locale/es/LC_MESSAGES/Horde_Crypt.mo              |  Bin 7500 -> 7471 bytes
 framework/Crypt/locale/es/LC_MESSAGES/Horde_Crypt.po              |   10 +-
 framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php            |    2 +-
 framework/Css_Parser/package.xml                                  |    4 +-
 framework/Dav/lib/Horde/Dav/Principals.php                        |   16 +-
 framework/Dav/lib/Horde/Dav/Translation.php                       |   55 +
 framework/Dav/locale/Horde_Dav.pot                                |   22 +
 framework/Dav/package.xml                                         |   49 +-
 framework/Exception/test/Horde/Exception/ExceptionTest.php        |   14 +-
 framework/HashTable/lib/Horde/HashTable/Base.php                  |    5 +
 framework/HashTable/lib/Horde/HashTable/Predis.php                |   14 +-
 framework/HashTable/package.xml                                   |   38 +-
 framework/History/lib/Horde/History.php                           |    8 +-
 framework/History/lib/Horde/History/Sql.php                       |    4 +-
 .../Horde/History/4_horde_history_add_compositeindex.php          |   25 +
 .../Horde/History/5_horde_history_remove_compositeindex.php       |   26 +
 .../Horde/History/6_horde_history_fix_botchedindexes.php          |   37 +
 framework/History/package.xml                                     |   93 +-
 framework/Icalendar/lib/Horde/Icalendar.php                       |    4 +-
 framework/Icalendar/package.xml                                   |   24 +-
 framework/Icalendar/test/Horde/Icalendar/ExportTest.php           |   55 +
 framework/Image/lib/Horde/Image/Effect/Im/CenterCrop.php          |    2 +-
 framework/Image/lib/Horde/Image/Exif/Exiftool.php                 |    2 +-
 framework/Image/package.xml                                       |   21 +-
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING             |    9 +
 framework/Imap_Client/lib/Horde/Imap/Client.php                   |    2 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |   28 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Mailbox.php      |    8 +
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |   87 +-
 framework/Imap_Client/locale/Horde_Imap_Client.pot                |   17 +-
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 7205 -> 7205 bytes
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.po  |   17 +-
 framework/Imap_Client/locale/es/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 6958 -> 6866 bytes
 framework/Imap_Client/locale/es/LC_MESSAGES/Horde_Imap_Client.po  |  112 +-
 framework/Imap_Client/package.xml                                 |   32 +-
 framework/Mail/doc/Horde/Mail/UPGRADING                           |   12 +
 framework/Mail/lib/Horde/Mail/Rfc822/Address.php                  |    9 +
 framework/Mail/lib/Horde/Mail/Rfc822/List.php                     |    7 +
 framework/Mail/lib/Horde/Mail/Transport/Smtp.php                  |    5 +
 framework/Mail/package.xml                                        |   27 +-
 framework/Memcache/lib/Horde/Memcache.php                         |   80 +-
 framework/Memcache/package.xml                                    |   49 +-
 framework/Mime/lib/Horde/Mime/Mail.php                            |    2 +
 framework/Mime/lib/Horde/Mime/Part.php                            |   16 +-
 framework/Mime/locale/Horde_Mime.pot                              |    6 +-
 framework/Mime/locale/de/LC_MESSAGES/Horde_Mime.mo                |  Bin 1309 -> 1309 bytes
 framework/Mime/locale/de/LC_MESSAGES/Horde_Mime.po                |    6 +-
 framework/Mime/locale/es/LC_MESSAGES/Horde_Mime.mo                |  Bin 1309 -> 1309 bytes
 framework/Mime/locale/es/LC_MESSAGES/Horde_Mime.po                |    6 +-
 framework/Mime/package.xml                                        |   44 +-
 framework/Mime/test/Horde/Mime/MailTest.php                       |   16 +-
 framework/Mime/test/Horde/Mime/PartTest.php                       |   28 +-
 framework/Mime/test/Horde/Mime/fixtures/bug12536.txt              |   14 +
 framework/Prefs/package.xml                                       |   23 +-
 framework/Rpc/doc/Horde/Rpc/examples/xmlrpc.php                   |    4 +-
 .../SessionHandler/lib/Horde/SessionHandler/Storage/Hashtable.php |    2 +-
 framework/SessionHandler/package.xml                              |   23 +-
 framework/Smtp/doc/Horde/Smtp/COPYING                             |  458 +
 framework/Smtp/lib/Horde/Smtp.php                                 |  723 +
 framework/Smtp/lib/Horde/Smtp/Connection.php                      |  224 +
 framework/Smtp/lib/Horde/Smtp/Debug.php                           |  145 +
 framework/Smtp/lib/Horde/Smtp/Exception.php                       |  160 +
 framework/Smtp/lib/Horde/Smtp/Filter/Data.php                     |   63 +
 framework/Smtp/lib/Horde/Smtp/Translation.php                     |   57 +
 framework/Smtp/locale/Horde_Smtp.pot                              |   66 +
 framework/Smtp/package.xml                                        |  153 +
 framework/Smtp/test/Horde/Smtp/AllTests.php                       |    3 +
 framework/Smtp/test/Horde/Smtp/RemoteServerTest.php               |   87 +
 framework/Smtp/test/Horde/Smtp/bootstrap.php                      |    3 +
 framework/Smtp/test/Horde/Smtp/conf.php.dist                      |    9 +
 framework/Smtp/test/Horde/Smtp/phpunit.xml                        |    1 +
 framework/Stream/lib/Horde/Stream.php                             |   35 +-
 framework/Stream/package.xml                                      |   27 +-
 framework/Stream/test/Horde/Stream/TempTest.php                   |   32 +
 framework/Stream_Filter/lib/Horde/Stream/Filter/Eol.php           |    4 +-
 framework/Stream_Filter/lib/Horde/Stream/Filter/Null.php          |    4 +-
 framework/Vfs/package.xml                                         |   23 +-
 framework/lz4/CREDITS                                             |    2 +-
 framework/lz4/LICENSE                                             |   88 +-
 framework/lz4/horde_lz4.h                                         |    2 +-
 framework/lz4/lz4.c                                               |  888 +-
 framework/lz4/lz4.h                                               |   93 +-
 framework/lz4/lz4_encoder.h                                       |  258 +
 framework/lz4/lz4hc.c                                             |  504 +-
 framework/lz4/lz4hc.h                                             |   67 +-
 framework/lz4/lz4hc_encoder.h                                     |  349 +
 framework/lz4/package.xml                                         |   38 +-
 gollem/locale/de/LC_MESSAGES/gollem.mo                            |  Bin 74046 -> 74084 bytes
 gollem/locale/hu/LC_MESSAGES/gollem.mo                            |  Bin 77048 -> 71270 bytes
 hermes/js/hermes.js                                               |    8 +-
 hermes/lib/Ajax/Application/Handler.php                           |    3 +-
 hermes/locale/de/LC_MESSAGES/hermes.mo                            |  Bin 81314 -> 81352 bytes
 hermes/locale/de/LC_MESSAGES/hermes.po                            |   20 +-
 hermes/locale/es/LC_MESSAGES/hermes.mo                            |  Bin 80452 -> 80452 bytes
 hermes/locale/es/LC_MESSAGES/hermes.po                            |   20 +-
 hermes/locale/hermes.pot                                          |   20 +-
 horde/.htaccess                                                   |    1 +
 horde/admin/sessions.php                                          |    4 +-
 horde/admin/user.php                                              |   34 +-
 horde/bin/horde-clear-cache                                       |    2 +-
 horde/docs/CHANGES                                                |   13 +-
 horde/docs/CREDITS                                                |    1 +
 horde/docs/RELEASE_NOTES                                          |   16 +-
 horde/docs/UPGRADING                                              |    2 +-
 horde/js/topbar.js                                                |   12 +-
 horde/lib/Application.php                                         |    2 +-
 horde/lib/LoginTasks/Task/LastLogin.php                           |    5 +-
 horde/lib/Prefs/Special/Activesync.php                            |   28 +-
 horde/lib/Test.php                                                |    7 +-
 horde/locale/de/LC_MESSAGES/horde.mo                              |  Bin 65929 -> 65967 bytes
 horde/locale/de/LC_MESSAGES/horde.po                              |   34 +-
 horde/locale/horde.pot                                            |   34 +-
 horde/locale/hu/LC_MESSAGES/horde.mo                              |  Bin 68014 -> 62085 bytes
 horde/locale/hu/LC_MESSAGES/horde.po                              | 1996 +-
 horde/login.php                                                   |    2 +-
 horde/package.xml                                                 |   33 +-
 horde/templates/admin/sessions.html.php                           |   48 +-
 horde/templates/admin/user/listfail.inc                           |    6 +
 horde/templates/tree/menu.html.php                                |    6 +-
 horde/themes/default/screen.css                                   |   13 +-
 imp/basic.php                                                     |    7 +-
 imp/config/backends.php                                           |   46 +-
 imp/config/hooks.php.dist                                         |   16 +-
 imp/docs/CHANGES                                                  |   28 +-
 imp/docs/CREDITS                                                  |    1 +
 imp/docs/RELEASE_NOTES                                            |   20 +-
 imp/docs/UPGRADING                                                |   12 +
 imp/js/compose-dimp.js                                            |   35 +-
 imp/js/message-dimp.js                                            |    3 +
 imp/js/smartmobile.js                                             |   53 +-
 imp/lib/Ajax/Application/Handler/Common.php                       |   42 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php                      |    5 +-
 imp/lib/Ajax/Application/ShowMessage.php                          |   17 +-
 imp/lib/Application.php                                           |   28 +-
 imp/lib/Basic/Compose.php                                         |   56 +-
 imp/lib/Basic/Error.php                                           |   31 +
 imp/lib/Basic/Message.php                                         |    2 +-
 imp/lib/Block/Summary.php                                         |    6 +-
 imp/lib/Compose.php                                               |   55 +-
 imp/lib/Compose/Ui.php                                            |   21 +-
 imp/lib/Compose/View.php                                          |    2 +-
 imp/lib/Dynamic/Compose.php                                       |    6 -
 imp/lib/Dynamic/Compose/Common.php                                |    9 +-
 imp/lib/Dynamic/Helper/Base.php                                   |    2 -
 imp/lib/Dynamic/Mailbox.php                                       |   22 +-
 imp/lib/Dynamic/Message.php                                       |    5 -
 imp/lib/Imap/Tree.php                                             |    8 +-
 imp/lib/Mailbox.php                                               |    6 +-
 imp/lib/Minimal/Compose.php                                       |   19 +-
 imp/lib/Minimal/Error.php                                         |   33 +
 imp/lib/Notification/Handler/Decorator/NewmailNotify.php          |    6 +-
 imp/lib/Prefs/Identity.php                                        |   20 +-
 imp/lib/Prefs/Special/Acl.php                                     |    2 +
 imp/lib/Prefs/Special/Mailto.php                                  |    2 +-
 imp/locale/de/LC_MESSAGES/imp.mo                                  |  Bin 184080 -> 184079 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                  |  403 +-
 imp/locale/es/LC_MESSAGES/imp.mo                                  |  Bin 180163 -> 180357 bytes
 imp/locale/es/LC_MESSAGES/imp.po                                  |  655 +-
 imp/locale/hu/LC_MESSAGES/imp.mo                                  |  Bin 190034 -> 149113 bytes
 imp/locale/hu/LC_MESSAGES/imp.po                                  | 5174 +++--
 imp/locale/imp.pot                                                |  405 +-
 imp/minimal.php                                                   |   18 +-
 imp/package.xml                                                   |   47 +-
 imp/templates/basic/mailbox/navbar.html.php                       |    2 +-
 imp/templates/dynamic/compose.html.php                            |    2 +
 imp/templates/itip/action.html.php                                |   14 +-
 imp/templates/smartmobile/message.html.php                        |   21 +-
 imp/themes/default/mime.css                                       |   21 +-
 ingo/docs/CHANGES                                                 |    9 +-
 ingo/docs/RELEASE_NOTES                                           |   14 +-
 ingo/lib/Api.php                                                  |   17 +-
 ingo/lib/Application.php                                          |    2 +-
 ingo/lib/Ingo.php                                                 |    4 +-
 ingo/locale/de/LC_MESSAGES/ingo.mo                                |  Bin 85482 -> 85520 bytes
 ingo/locale/de/LC_MESSAGES/ingo.po                                |   28 +-
 ingo/locale/es/LC_MESSAGES/ingo.mo                                |  Bin 84440 -> 84440 bytes
 ingo/locale/es/LC_MESSAGES/ingo.po                                |   48 +-
 ingo/locale/hu/LC_MESSAGES/ingo.mo                                |  Bin 86815 -> 81133 bytes
 ingo/locale/ingo.pot                                              |   28 +-
 ingo/package.xml                                                  |   24 +-
 jonah/locale/de/LC_MESSAGES/jonah.mo                              |  Bin 75807 -> 75845 bytes
 klutz/locale/de/LC_MESSAGES/klutz.mo                              |  Bin 70629 -> 70667 bytes
 kronolith/docs/CHANGES                                            |   14 +-
 kronolith/docs/RELEASE_NOTES                                      |   13 +-
 kronolith/js/kronolith.js                                         |    4 +-
 kronolith/lib/Ajax/Application/Handler.php                        |   19 +-
 kronolith/lib/Api.php                                             |    5 +-
 kronolith/lib/Application.php                                     |   15 +-
 kronolith/lib/Calendar.php                                        |    2 +-
 kronolith/lib/Calendar/External/Tasks.php                         |   10 +-
 kronolith/lib/Calendar/Internal.php                               |   10 +-
 kronolith/lib/Event.php                                           |    4 +
 kronolith/lib/Form/EditCalendar.php                               |   30 +-
 kronolith/locale/de/LC_MESSAGES/kronolith.mo                      |  Bin 127588 -> 127718 bytes
 kronolith/locale/de/LC_MESSAGES/kronolith.po                      |  308 +-
 kronolith/locale/es/LC_MESSAGES/kronolith.mo                      |  Bin 126589 -> 126700 bytes
 kronolith/locale/es/LC_MESSAGES/kronolith.po                      |  370 +-
 kronolith/locale/hu/LC_MESSAGES/kronolith.mo                      |  Bin 124682 -> 118999 bytes
 kronolith/locale/kronolith.pot                                    |  308 +-
 kronolith/package.xml                                             |   30 +-
 kronolith/templates/chunks/calendar.php                           |    4 +-
 kronolith/themes/default/dynamic/screen.css                       |    2 +-
 luxor/locale/de/LC_MESSAGES/luxor.mo                              |  Bin 67898 -> 67936 bytes
 mnemo/docs/CHANGES                                                |    8 +-
 mnemo/docs/RELEASE_NOTES                                          |   12 +-
 mnemo/lib/Application.php                                         |    2 +-
 mnemo/lib/Notepads/Base.php                                       |    2 +-
 mnemo/locale/de/LC_MESSAGES/mnemo.mo                              |  Bin 75463 -> 75501 bytes
 mnemo/locale/es/LC_MESSAGES/mnemo.mo                              |  Bin 74648 -> 74648 bytes
 mnemo/locale/es/LC_MESSAGES/mnemo.po                              |   38 +-
 mnemo/locale/hu/LC_MESSAGES/mnemo.mo                              |  Bin 78696 -> 72935 bytes
 mnemo/locale/hu/LC_MESSAGES/mnemo.po                              |    2 +-
 mnemo/package.xml                                                 |   23 +-
 nag/docs/CHANGES                                                  |   18 +-
 nag/docs/RELEASE_NOTES                                            |   16 +-
 nag/lib/Ajax/Application/Handler/Smartmobile.php                  |    5 +-
 nag/lib/Api.php                                                   |   25 +-
 nag/lib/Application.php                                           |   18 +-
 nag/lib/Block/Summary.php                                         |    2 +-
 nag/lib/Driver.php                                                |    3 +-
 nag/lib/Driver/Smartlist.php                                      |    4 +-
 nag/lib/Driver/Sql.php                                            |   71 +-
 nag/lib/Form/EditTaskList.php                                     |   30 +-
 nag/lib/Form/Task.php                                             |    3 +-
 nag/lib/LoginTasks/Task/PurgeCompleted.php                        |    3 +-
 nag/lib/Nag.php                                                   |    5 +-
 nag/lib/Search.php                                                |    3 +-
 nag/lib/Task.php                                                  |    6 +-
 nag/lib/Tasklist.php                                              |    6 +-
 nag/lib/View/List.php                                             |    3 +-
 nag/locale/de/LC_MESSAGES/nag.mo                                  |  Bin 92149 -> 92187 bytes
 nag/locale/de/LC_MESSAGES/nag.po                                  |  206 +-
 nag/locale/es/LC_MESSAGES/nag.mo                                  |  Bin 91399 -> 91331 bytes
 nag/locale/es/LC_MESSAGES/nag.po                                  |  236 +-
 nag/locale/hu/LC_MESSAGES/nag.mo                                  |  Bin 90729 -> 85051 bytes
 nag/locale/hu/LC_MESSAGES/nag.po                                  |    2 +-
 nag/locale/nag.pot                                                |  206 +-
 nag/locale/nl/LC_MESSAGES/nag.mo                                  |  Bin 88441 -> 88446 bytes
 nag/locale/nl/LC_MESSAGES/nag.po                                  |    4 +-
 nag/package.xml                                                   |   35 +-
 nag/view.php                                                      |    2 +-
 passwd/config/backends.php                                        |    2 +
 passwd/docs/RELEASE_NOTES                                         |   10 +-
 passwd/lib/Basic.php                                              |    6 +-
 passwd/lib/Driver/Kolab.php                                       |    6 +-
 passwd/lib/Driver/Ldap.php                                        |   10 +-
 passwd/lib/Driver/Smbpasswd.php                                   |    2 +-
 passwd/locale/de/LC_MESSAGES/passwd.mo                            |  Bin 71884 -> 71922 bytes
 passwd/locale/hu/LC_MESSAGES/passwd.mo                            |  Bin 72267 -> 66552 bytes
 sam/locale/de/LC_MESSAGES/sam.mo                                  |  Bin 69963 -> 70001 bytes
 sesha/locale/de/LC_MESSAGES/sesha.mo                              |  Bin 74732 -> 74770 bytes
 timeobjects/docs/CHANGES                                          |    7 -
 timeobjects/locale/de/LC_MESSAGES/timeobjects.mo                  |  Bin 66442 -> 66504 bytes
 timeobjects/locale/hu/LC_MESSAGES/timeobjects.mo                  |  Bin 68547 -> 62729 bytes
 trean/docs/CHANGES                                                |    8 +-
 trean/docs/RELEASE_NOTES                                          |   10 +-
 trean/lib/Application.php                                         |    2 +-
 trean/locale/de/LC_MESSAGES/trean.mo                              |  Bin 70241 -> 70352 bytes
 trean/locale/de/LC_MESSAGES/trean.po                              |   38 +-
 trean/locale/es/LC_MESSAGES/trean.mo                              |  Bin 69671 -> 69774 bytes
 trean/locale/es/LC_MESSAGES/trean.po                              |   66 +-
 trean/locale/trean.pot                                            |   36 +-
 trean/package.xml                                                 |   23 +-
 turba/docs/CHANGES                                                |   13 +-
 turba/docs/RELEASE_NOTES                                          |   21 +-
 turba/lib/Api.php                                                 |    6 +-
 turba/lib/Application.php                                         |    4 +-
 turba/lib/Driver.php                                              |   46 +-
 turba/lib/Driver/Kolab.php                                        |   45 +-
 turba/lib/View/Browse.php                                         |    3 +
 turba/locale/de/LC_MESSAGES/turba.mo                              |  Bin 98599 -> 98637 bytes
 turba/locale/de/LC_MESSAGES/turba.po                              |   52 +-
 turba/locale/es/LC_MESSAGES/turba.mo                              |  Bin 98036 -> 98006 bytes
 turba/locale/es/LC_MESSAGES/turba.po                              |  160 +-
 turba/locale/hu/LC_MESSAGES/turba.mo                              |  Bin 99825 -> 94084 bytes
 turba/locale/hu/LC_MESSAGES/turba.po                              |    2 +-
 turba/locale/turba.pot                                            |   52 +-
 turba/package.xml                                                 |   28 +-
 turba/test/Turba/Unit/Driver/Base.php                             |   13 +
 ulaform/locale/de/LC_MESSAGES/ulaform.mo                          |  Bin 71698 -> 71736 bytes
 vilma/lib/Driver.php                                              |    2 +-
 vilma/locale/de/LC_MESSAGES/vilma.mo                              |  Bin 77289 -> 77327 bytes
 whups/docs/CHANGES                                                |   11 +
 whups/docs/RELEASE_NOTES                                          |   14 +-
 whups/lib/Api.php                                                 |    2 -
 whups/lib/Application.php                                         |    2 +-
 whups/lib/Driver.php                                              |   77 +-
 whups/lib/Driver/Sql.php                                          |   44 +-
 whups/lib/Ticket.php                                              |   17 +-
 whups/lib/Whups.php                                               |   15 +-
 whups/locale/de/LC_MESSAGES/whups.mo                              |  Bin 107814 -> 107852 bytes
 whups/locale/de/LC_MESSAGES/whups.po                              |  102 +-
 whups/locale/es/LC_MESSAGES/whups.mo                              |  Bin 106128 -> 106223 bytes
 whups/locale/es/LC_MESSAGES/whups.po                              |  366 +-
 whups/locale/hu/LC_MESSAGES/whups.mo                              |  Bin 106916 -> 101211 bytes
 whups/locale/whups.pot                                            |  102 +-
 whups/package.xml                                                 |   32 +-
 whups/query/run.php                                               |    5 +-
 whups/templates/ticket/watchers.inc                               |    8 +-
 wicked/docs/CHANGES                                               |    7 +
 wicked/docs/RELEASE_NOTES                                         |   12 +-
 wicked/lib/Page.php                                               |    4 +-
 wicked/locale/de/LC_MESSAGES/wicked.mo                            |  Bin 78073 -> 78150 bytes
 wicked/locale/de/LC_MESSAGES/wicked.po                            |   37 +-
 wicked/locale/es/LC_MESSAGES/wicked.mo                            |  Bin 77518 -> 77553 bytes
 wicked/locale/es/LC_MESSAGES/wicked.po                            |   35 +-
 wicked/locale/wicked.pot                                          |   35 +-
 wicked/package.xml                                                |   28 +-
 414 files changed, 14433 insertions(+), 9158 deletions(-)

http://github.com/horde/horde/commit/232b26328ae0f0622714985f2207a61d46e7e4be
http://git.horde.org/horde-git/-/commit/232b26328ae0f0622714985f2207a61d46e7e4be

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

commit fce4dc3c501c75e52c6d3f522f4173b81d13396b
Merge: 232b263 f46433c
Author: Jan Schneider <jan at horde.org>
Date:   Tue Aug 27 23:18:12 2013 +0200

    Merge branch 'master' into trean_1_1

 .travis.yml                                                       |    8 +-
 agora/locale/de/LC_MESSAGES/agora.mo                              |  Bin 81870 -> 82118 bytes
 ansel/docs/CHANGES                                                |    9 +-
 ansel/docs/INSTALL                                                |    6 +-
 ansel/docs/RELEASE_NOTES                                          |   17 +-
 ansel/docs/TODO                                                   |    5 -
 ansel/lib/Application.php                                         |    2 +-
 ansel/locale/de/LC_MESSAGES/ansel.mo                              |  Bin 106904 -> 107152 bytes
 ansel/package.xml                                                 |   33 +-
 chora/locale/cs/LC_MESSAGES/chora.mo                              |  Bin 71529 -> 71525 bytes
 chora/locale/de/LC_MESSAGES/chora.mo                              |  Bin 71704 -> 71952 bytes
 chora/locale/sk/LC_MESSAGES/chora.mo                              |  Bin 71458 -> 69518 bytes
 chora/themes/default/screen.css                                   |    1 -
 components/lib/Components/Release/Task/Freecode.php               |   11 +-
 content/test/Content/Base.php                                     |    6 +-
 content/test/Content/Sql/MysqlTest.php                            |    6 +-
 content/test/Content/Sql/MysqliTest.php                           |    6 +-
 content/test/Content/Sql/Pdo/MysqlTest.php                        |    6 +-
 content/test/Content/Sql/Pdo/PgsqlTest.php                        |    6 +-
 content/test/Content/Sql/Pdo/SqliteTest.php                       |   26 +-
 content/test/Content/conf.php.dist                                |   55 +-
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |   31 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php         |   21 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |   19 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |   58 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php        |   35 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php     |    7 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/ItemOperations.php    |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php        |    7 +
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php      |   14 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |    7 +
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |   47 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Timezone.php            |  103 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php               |   18 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php       |   21 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php       |   20 +-
 framework/ActiveSync/package.xml                                  |   45 +-
 framework/ActiveSync/test/Horde/ActiveSync/ServerTest.php         |    8 +-
 framework/Alarm/test/Horde/Alarm/HandlerTest.php                  |    2 +-
 framework/Autoloader_Cache/package.xml                            |   23 +-
 framework/Browser/lib/Horde/Browser.php                           |    3 +-
 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/Browser/package.xml                                     |   21 +-
 framework/Core/js/spellchecker.js                                 |    8 +-
 framework/Core/lib/Horde.php                                      |   24 +-
 framework/Core/lib/Horde/Config.php                               |   13 -
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php            |    4 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |    6 +-
 framework/Core/lib/Horde/Core/Factory/Mail.php                    |    4 +-
 framework/Core/lib/Horde/Core/Factory/Token.php                   |    8 +-
 framework/Core/lib/Horde/ErrorHandler.php                         |    4 +
 framework/Core/lib/Horde/Registry.php                             |   41 +-
 framework/Core/lib/Horde/Session.php                              |   82 +-
 framework/Core/locale/Horde_Core.pot                              |   61 +-
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.mo                |  Bin 20259 -> 20259 bytes
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.po                |   56 +-
 framework/Core/locale/sk/LC_MESSAGES/Horde_Core.mo                |  Bin 19588 -> 19865 bytes
 framework/Core/locale/sk/LC_MESSAGES/Horde_Core.po                |  270 +-
 framework/Core/package.xml                                        |   36 +-
 framework/Crypt/lib/Horde/Crypt/Pgp.php                           |   12 +-
 framework/Crypt/locale/sk/LC_MESSAGES/Horde_Crypt.mo              |  Bin 7402 -> 7379 bytes
 framework/Crypt/locale/sk/LC_MESSAGES/Horde_Crypt.po              |   88 +-
 framework/Crypt/package.xml                                       |   21 +-
 framework/Css_Parser/package.xml                                  |   21 +-
 framework/Db/bin/horde-db-migrate-component                       |    2 +-
 framework/Db/package.xml                                          |   21 +-
 framework/Exception/package.xml                                   |   21 +-
 framework/HashTable/lib/Horde/HashTable/Predis.php                |    2 +-
 framework/History/lib/Horde/History.php                           |   47 +-
 framework/History/lib/Horde/History/Mock.php                      |    4 +-
 framework/History/lib/Horde/History/Sql.php                       |   68 +-
 .../migration/Horde/History/3_horde_history_add_modseq.php        |    4 +-
 framework/History/package.xml                                     |   29 +-
 framework/History/test/Horde/History/Sql/MysqliTest.php           |    2 +-
 framework/History/test/Horde/History/Sql/Pdo/PgsqlTest.php        |    1 -
 framework/History/test/Horde/History/TestBase.php                 |  119 +-
 framework/Http/package.xml                                        |   21 +-
 framework/Icalendar/test/Horde/Icalendar/ExportTest.php           |    2 +
 framework/Icalendar/test/Horde/Icalendar/ParseTest.php            |    8 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/escapes1.ics    |    2 +
 framework/Icalendar/test/Horde/Icalendar/fixtures/escapes2.ics    |    2 +
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING             |   38 +
 framework/Imap_Client/lib/Horde/Imap/Client.php                   |    2 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |  113 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Password.php     |   33 +
 .../lib/Horde/Imap/Client/Interaction/Command/Continuation.php    |    8 +
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |  178 +-
 .../Imap_Client/lib/Horde/Imap/Client/Socket/Connection/Pop3.php  |    4 +-
 .../lib/Horde/Imap/Client/Socket/Connection/Socket.php            |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php       |   83 +-
 framework/Imap_Client/locale/Horde_Imap_Client.pot                |  104 +-
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.mo  |  Bin 7205 -> 7202 bytes
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.po  |  108 +-
 framework/Imap_Client/package.xml                                 |  103 +-
 .../Imap_Client/test/Horde/Imap/Client/RemoteImapServerTest.php   |    4 +
 .../Imap_Client/test/Horde/Imap/Client/RemotePop3ServerTest.php   |   81 +
 framework/Imap_Client/test/Horde/Imap/Client/conf.php.dist        |   23 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Event.php       |   11 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php   |   24 +-
 framework/Kolab_Storage/locale/Horde_Kolab_Storage.pot            |    3 +-
 .../Kolab_Storage/locale/de/LC_MESSAGES/Horde_Kolab_Storage.mo    |  Bin 5932 -> 5932 bytes
 .../Kolab_Storage/locale/de/LC_MESSAGES/Horde_Kolab_Storage.po    |    3 +-
 framework/Kolab_Storage/package.xml                               |   24 +-
 .../Storage/ComponentTest/Data/Object/Message/ModifiedTest.php    |    5 +
 .../Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php   |    5 +
 framework/Mail/doc/Horde/Mail/UPGRADING                           |    4 +
 framework/Mail/lib/Horde/Mail/Rfc822/List.php                     |    1 +
 framework/Mail/lib/Horde/Mail/Transport.php                       |   17 +-
 framework/Mail/lib/Horde/Mail/Transport/Smtp.php                  |   19 +
 framework/Mail/lib/Horde/Mail/Transport/Smtphorde.php             |  160 +
 framework/Mail/package.xml                                        |   60 +-
 framework/Mime/lib/Horde/Mime/Headers.php                         |    2 +-
 framework/Mime/lib/Horde/Mime/Part.php                            |   52 +-
 framework/Mime/package.xml                                        |   25 +-
 framework/Mime/test/Horde/Mime/MailTest.php                       |   22 +-
 framework/Perms/package.xml                                       |   21 +-
 framework/Queue/package.xml                                       |   31 +-
 framework/Release/lib/Horde/Release/Freecode.php                  |    2 +-
 framework/Service_Facebook/package.xml                            |   21 +-
 .../SessionHandler/lib/Horde/SessionHandler/Storage/File.php      |    2 +-
 .../SessionHandler/lib/Horde/SessionHandler/Storage/Hashtable.php |   35 +-
 framework/SessionHandler/package.xml                              |   34 +-
 framework/Smtp/doc/Horde/Smtp/UPGRADING                           |   24 +
 framework/Smtp/lib/Horde/Smtp.php                                 |  141 +-
 framework/Smtp/lib/Horde/Smtp/Connection.php                      |   51 +-
 framework/Smtp/lib/Horde/Smtp/Debug.php                           |   16 +-
 framework/Smtp/lib/Horde/Smtp/Filter/Data.php                     |    2 +-
 framework/Smtp/lib/Horde/Smtp/Password.php                        |   32 +
 framework/Smtp/locale/Horde_Smtp.pot                              |   26 +-
 framework/Smtp/package.xml                                        |   55 +-
 framework/Smtp/test/Horde/Smtp/conf.php.dist                      |    3 +-
 framework/Support/lib/Horde/Support/Stub.php                      |   48 +-
 framework/Support/package.xml                                     |    4 +-
 framework/Support/test/Horde/Support/StubTest.php                 |   27 +
 framework/SyncMl/lib/Horde/SyncMl/Sync.php                        |    4 +-
 framework/Test/package.xml                                        |   21 +-
 framework/Tree/lib/Horde/Tree.php                                 |    1 +
 framework/Url/lib/Horde/Url.php                                   |    4 +-
 framework/Url/package.xml                                         |   21 +-
 framework/View/lib/Horde/View/Base.php                            |    5 +-
 framework/View/package.xml                                        |   21 +-
 gollem/lib/Auth.php                                               |   62 +-
 gollem/lib/Factory/Vfs.php                                        |    5 -
 gollem/locale/cs/LC_MESSAGES/gollem.mo                            |  Bin 73031 -> 73027 bytes
 gollem/locale/de/LC_MESSAGES/gollem.mo                            |  Bin 74084 -> 74332 bytes
 gollem/locale/sk/LC_MESSAGES/gollem.mo                            |  Bin 72384 -> 70452 bytes
 gollem/package.xml                                                |    9 +-
 hermes/js/hermes.js                                               |  315 +-
 hermes/lib/Ajax.php                                               |    5 +-
 hermes/lib/Ajax/Application/Handler.php                           |   81 +-
 hermes/lib/Hermes.php                                             |    9 +-
 hermes/locale/de/LC_MESSAGES/hermes.mo                            |  Bin 81352 -> 82147 bytes
 hermes/locale/de/LC_MESSAGES/hermes.po                            |  153 +-
 hermes/locale/hermes.pot                                          |  151 +-
 hermes/templates/dynamic/deliverables.inc                         |   45 +
 hermes/templates/dynamic/index.inc                                |    3 +-
 hermes/templates/dynamic/jobtypes.inc                             |   63 +-
 hermes/templates/dynamic/sidebar.html.php                         |    6 +
 hermes/templates/dynamic/slices.inc                               |    2 +-
 hermes/themes/default/dynamic/screen.css                          |   73 +-
 horde/admin/activesync.php                                        |    5 +-
 horde/docs/CHANGES                                                |   11 +-
 horde/docs/RELEASE_NOTES                                          |   12 +-
 horde/lib/Application.php                                         |    2 +-
 horde/lib/Prefs/Special/Activesync.php                            |    1 +
 horde/lib/Test.php                                                |    3 -
 horde/locale/cs/LC_MESSAGES/horde.mo                              |  Bin 64465 -> 64461 bytes
 horde/locale/cs/LC_MESSAGES/horde.po                              |    4 +-
 horde/locale/de/LC_MESSAGES/horde.mo                              |  Bin 65967 -> 66215 bytes
 horde/locale/de/LC_MESSAGES/horde.po                              |   99 +-
 horde/locale/horde.pot                                            |   95 +-
 horde/locale/sk/LC_MESSAGES/horde.mo                              |  Bin 64474 -> 62600 bytes
 horde/locale/sk/LC_MESSAGES/horde.po                              | 1007 +-
 horde/login.php                                                   |   10 -
 horde/package.xml                                                 |   28 +-
 horde/services/ajax.php                                           |    8 +-
 horde/templates/admin/sessions.html.php                           |    4 +-
 horde/templates/portal/layout.inc                                 |    2 +-
 horde/themes/default/screen.css                                   |    9 +-
 imp/config/backends.php                                           |    4 +-
 imp/config/prefs.php                                              |    6 +-
 imp/docs/CHANGES                                                  |   14 +-
 imp/docs/RELEASE_NOTES                                            |   22 +-
 imp/docs/RFCS                                                     |   35 +-
 imp/js/compose-dimp.js                                            |    2 +-
 imp/js/compose.js                                                 |   12 +-
 imp/js/dimpbase.js                                                |   20 +
 imp/js/message-dimp.js                                            |    4 +-
 imp/js/smartmobile.js                                             |    9 +
 imp/lib/Ajax/Application/Handler/Dynamic.php                      |    4 +-
 imp/lib/Ajax/Queue.php                                            |    9 +-
 imp/lib/Application.php                                           |    8 +-
 imp/lib/Basic/Compose.php                                         |   23 +-
 imp/lib/Basic/Mailbox.php                                         |   15 +-
 imp/lib/Basic/Message.php                                         |    6 +-
 imp/lib/Basic/Search.php                                          |    4 +-
 imp/lib/Basic/Thread.php                                          |    5 +-
 imp/lib/Compose/Link.php                                          |    8 +-
 imp/lib/Contents.php                                              |    2 +-
 imp/lib/Crypt/Pgp.php                                             |   20 +-
 imp/lib/Crypt/Smime.php                                           |   15 +-
 imp/lib/Dynamic/Mailbox.php                                       |    5 +-
 imp/lib/Factory/Imap.php                                          |    5 -
 imp/lib/Factory/Mail.php                                          |   67 +-
 imp/lib/Imap.php                                                  |   18 +-
 imp/lib/Imap/Config.php                                           |   48 +-
 imp/lib/Imap/Password.php                                         |   74 +
 imp/lib/Imap/Tree.php                                             |    8 +-
 imp/lib/Mailbox.php                                               |    2 +-
 imp/lib/Message.php                                               |    3 +
 imp/lib/Notification/Handler/Decorator/NewmailNotify.php          |    2 +-
 imp/lib/Script/Package/ComposeBase.php                            |    4 +-
 imp/locale/de/LC_MESSAGES/imp.mo                                  |  Bin 184079 -> 184529 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                  |  423 +-
 imp/locale/en/help.xml                                            |    2 +-
 imp/locale/imp.pot                                                |  423 +-
 imp/locale/sk/LC_MESSAGES/imp.mo                                  |  Bin 178051 -> 178000 bytes
 imp/locale/sk/LC_MESSAGES/imp.po                                  | 3016 +++--
 imp/package.xml                                                   |   45 +-
 imp/test/Imp/Unit/Mime/Viewer/ItipTest.php                        |    2 +-
 imp/themes/default/basic/screen.css                               |    1 +
 imp/themes/default/dynamic/screen.css                             |    6 -
 imp/themes/default/screen.css                                     |    2 -
 imp/themes/default/smartmobile/screen.css                         |    1 -
 ingo/locale/cs/LC_MESSAGES/ingo.mo                                |  Bin 77520 -> 77516 bytes
 ingo/locale/de/LC_MESSAGES/ingo.mo                                |  Bin 85520 -> 85776 bytes
 ingo/locale/sk/LC_MESSAGES/ingo.mo                                |  Bin 83621 -> 81972 bytes
 ingo/locale/sk/LC_MESSAGES/ingo.po                                |  533 +-
 jonah/locale/de/LC_MESSAGES/jonah.mo                              |  Bin 75845 -> 76125 bytes
 klutz/locale/cs/LC_MESSAGES/klutz.mo                              |  Bin 68940 -> 68936 bytes
 klutz/locale/de/LC_MESSAGES/klutz.mo                              |  Bin 70667 -> 70947 bytes
 kronolith/docs/CHANGES                                            |    6 +
 kronolith/docs/RELEASE_NOTES                                      |   11 +-
 kronolith/js/kronolith.js                                         |   17 +-
 kronolith/lib/Api.php                                             |    4 +-
 kronolith/lib/Calendar/External/Tasks.php                         |   11 +-
 kronolith/lib/Calendar/Internal.php                               |   11 +-
 kronolith/lib/Driver/Horde.php                                    |   24 +-
 kronolith/lib/Driver/Ical.php                                     |   23 +-
 kronolith/lib/Driver/Kolab.php                                    |   29 +-
 kronolith/lib/Event.php                                           |   15 +-
 kronolith/lib/Event/Holidays.php                                  |    1 -
 kronolith/lib/Event/Horde.php                                     |    8 +-
 kronolith/lib/Event/Sql.php                                       |    4 +
 kronolith/lib/Form/EditCalendar.php                               |   57 +-
 kronolith/lib/View/EditEvent.php                                  |    4 +-
 kronolith/locale/cs/LC_MESSAGES/kronolith.mo                      |  Bin 86783 -> 86779 bytes
 kronolith/locale/de/LC_MESSAGES/kronolith.mo                      |  Bin 127718 -> 128131 bytes
 kronolith/locale/de/LC_MESSAGES/kronolith.po                      |  278 +-
 kronolith/locale/kronolith.pot                                    |  278 +-
 kronolith/locale/sk/LC_MESSAGES/kronolith.mo                      |  Bin 124536 -> 122668 bytes
 kronolith/package.xml                                             |    8 +
 kronolith/templates/chunks/calendar.php                           |    1 +
 luxor/locale/de/LC_MESSAGES/luxor.mo                              |  Bin 67936 -> 68224 bytes
 mnemo/docs/CHANGES                                                |    1 +
 mnemo/lib/Api.php                                                 |   10 +-
 mnemo/lib/Driver.php                                              |   29 +-
 mnemo/lib/Mnemo.php                                               |   15 +-
 mnemo/locale/cs/LC_MESSAGES/mnemo.mo                              |  Bin 71740 -> 71736 bytes
 mnemo/locale/de/LC_MESSAGES/mnemo.mo                              |  Bin 75501 -> 75773 bytes
 mnemo/locale/de/LC_MESSAGES/mnemo.po                              |   12 +-
 mnemo/locale/mnemo.pot                                            |   14 +-
 mnemo/locale/sk/LC_MESSAGES/mnemo.mo                              |  Bin 74156 -> 72256 bytes
 mnemo/package.xml                                                 |    6 +-
 nag/docs/CHANGES                                                  |   10 +-
 nag/docs/RELEASE_NOTES                                            |   14 +-
 nag/lib/Application.php                                           |    2 +-
 nag/lib/Driver.php                                                |    2 +-
 nag/lib/Form/EditTaskList.php                                     |   57 +-
 nag/lib/View/List.php                                             |   10 +-
 nag/locale/cs/LC_MESSAGES/nag.mo                                  |  Bin 75394 -> 75390 bytes
 nag/locale/de/LC_MESSAGES/nag.mo                                  |  Bin 92187 -> 92459 bytes
 nag/locale/de/LC_MESSAGES/nag.po                                  |   24 +-
 nag/locale/nag.pot                                                |   26 +-
 nag/locale/sk/LC_MESSAGES/nag.mo                                  |  Bin 88448 -> 86540 bytes
 nag/package.xml                                                   |   25 +-
 nag/templates/list/_task.html.php                                 |    2 +-
 passwd/docs/CHANGES                                               |    8 +-
 passwd/docs/RELEASE_NOTES                                         |    6 +-
 passwd/lib/Application.php                                        |    2 +-
 passwd/locale/cs/LC_MESSAGES/passwd.mo                            |  Bin 69964 -> 69960 bytes
 passwd/locale/de/LC_MESSAGES/passwd.mo                            |  Bin 71922 -> 72170 bytes
 passwd/locale/sk/LC_MESSAGES/passwd.mo                            |  Bin 70251 -> 68359 bytes
 passwd/package.xml                                                |   26 +-
 sam/locale/cs/LC_MESSAGES/sam.mo                                  |  Bin 68734 -> 68730 bytes
 sam/locale/de/LC_MESSAGES/sam.mo                                  |  Bin 70001 -> 70273 bytes
 sesha/locale/de/LC_MESSAGES/sesha.mo                              |  Bin 74770 -> 75018 bytes
 timeobjects/locale/de/LC_MESSAGES/timeobjects.mo                  |  Bin 66504 -> 66752 bytes
 trean/locale/de/LC_MESSAGES/trean.mo                              |  Bin 70352 -> 70632 bytes
 turba/docs/CHANGES                                                |   13 +-
 turba/docs/RELEASE_NOTES                                          |   11 +-
 turba/lib/Application.php                                         |    2 +-
 turba/lib/Driver/Kolab.php                                        |    8 +
 turba/lib/Factory/Driver.php                                      |    1 +
 turba/lib/Form/EditAddressBook.php                                |   45 +-
 turba/locale/cs/LC_MESSAGES/turba.mo                              |  Bin 95196 -> 95192 bytes
 turba/locale/de/LC_MESSAGES/turba.mo                              |  Bin 98637 -> 98885 bytes
 turba/locale/de/LC_MESSAGES/turba.po                              |  116 +-
 turba/locale/sk/LC_MESSAGES/turba.mo                              |  Bin 95619 -> 94100 bytes
 turba/locale/sk/LC_MESSAGES/turba.po                              |  525 +-
 turba/locale/turba.pot                                            |  118 +-
 turba/package.xml                                                 |   25 +-
 ulaform/locale/de/LC_MESSAGES/ulaform.mo                          |  Bin 71736 -> 71984 bytes
 vilma/locale/de/LC_MESSAGES/vilma.mo                              |  Bin 77327 -> 77599 bytes
 whups/docs/CHANGES                                                |    9 +
 whups/docs/RELEASE_NOTES                                          |   10 +-
 whups/lib/Ajax/Application.php                                    |   35 +
 whups/lib/Block/Tickets.php                                       |    3 +-
 whups/lib/Driver/Sql.php                                          |   13 +-
 whups/lib/Ui/VarRenderer/Whups.php                                |    8 +-
 whups/lib/View/Results.php                                        |    5 +-
 whups/locale/cs/LC_MESSAGES/whups.mo                              |  Bin 102680 -> 102676 bytes
 whups/locale/de/LC_MESSAGES/whups.mo                              |  Bin 107852 -> 108100 bytes
 whups/locale/de/LC_MESSAGES/whups.po                              |   65 +-
 whups/locale/whups.pot                                            |   65 +-
 whups/package.xml                                                 |   28 +-
 whups/query/run.php                                               |    1 +
 whups/queue/index.php                                             |    1 +
 whups/search.php                                                  |    1 +
 whups/templates/view/results.inc                                  |    6 +-
 wicked/docs/CHANGES                                               |    8 +
 wicked/docs/RELEASE_NOTES                                         |   10 +-
 wicked/lib/Driver/Sql.php                                         |    2 +-
 wicked/lib/Page.php                                               |    9 +-
 wicked/lib/Page/NewPage.php                                       |   15 +
 wicked/lib/Page/RecentChanges.php                                 |    3 +-
 wicked/locale/de/LC_MESSAGES/wicked.mo                            |  Bin 78150 -> 78398 bytes
 wicked/locale/de/LC_MESSAGES/wicked.po                            |   46 +-
 wicked/locale/sk/LC_MESSAGES/wicked.mo                            |  Bin 78902 -> 73757 bytes
 wicked/locale/sk/LC_MESSAGES/wicked.po                            |  131 -
 wicked/locale/wicked.pot                                          |   46 +-
 wicked/package.xml                                                |   22 +-
 wicked/templates/edit/new.html.php                                |    8 +
 335 files changed, 8094 insertions(+), 5461 deletions(-)

http://github.com/horde/horde/commit/fce4dc3c501c75e52c6d3f522f4173b81d13396b
http://git.horde.org/horde-git/-/commit/fce4dc3c501c75e52c6d3f522f4173b81d13396b

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

commit 697675adab7ef550d106e6c64bcf8c7a0804c6b3
Author: Jan Schneider <jan at horde.org>
Date:   Tue Aug 27 23:20:58 2013 +0200

    Fix changelogs.

 trean/docs/CHANGES |    5 -----
 trean/package.xml  |   18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

http://github.com/horde/horde/commit/697675adab7ef550d106e6c64bcf8c7a0804c6b3
http://git.horde.org/horde-git/-/commit/697675adab7ef550d106e6c64bcf8c7a0804c6b3

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

commit b82cd461c8711fe368229fd788137dd2d15cdc8a
Merge: 697675a fe9b094
Author: Jan Schneider <jan at horde.org>
Date:   Tue Sep 3 10:25:52 2013 +0200

    Merge branch 'master' into trean_1_1

 ansel/docs/CHANGES                                                |    1 +
 ansel/lib/ActionHandler.php                                       |    1 +
 ansel/lib/Image.php                                               |   10 +-
 ansel/lib/Queue/ProcessThumbs.php                                 |    5 +-
 ansel/package.xml                                                 |    4 +-
 bundles/groupware/docs/CHANGES                                    |  273 ++++
 bundles/groupware/docs/RELEASE_NOTES                              |   36 +-
 bundles/groupware/package.xml                                     |   14 +-
 bundles/webmail/docs/CHANGES                                      |  298 +++++
 bundles/webmail/docs/RELEASE_NOTES                                |   52 +-
 bundles/webmail/package.xml                                       |   16 +-
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |   39 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php         |   34 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php  |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Device.php              |   41 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php         |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Policies.php            |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php        |    5 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |   12 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php          |    3 +-
 framework/ActiveSync/package.xml                                  |   63 +-
 framework/Auth/lib/Horde/Auth/X509.php                            |  153 +++
 framework/Auth/package.xml                                        |   29 +-
 framework/Core/js/dialog.js                                       |    1 -
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   11 +-
 framework/Core/lib/Horde/Core/Factory/ActiveSyncBackend.php       |    3 +-
 framework/Core/lib/Horde/Core/Factory/ThemesCache.php             |    8 +-
 framework/Core/lib/Horde/Core/Topbar.php                          |    3 +-
 framework/Core/lib/Horde/Registry.php                             |    7 +-
 framework/Core/lib/Horde/Registry/Application.php                 |   12 +-
 framework/Core/lib/Horde/Session/Null.php                         |   12 +-
 framework/Core/package.xml                                        |   38 +-
 framework/History/package.xml                                     |    2 +-
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING             |   11 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |   27 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Connection.php   |    9 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |   28 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Connection.php |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php       |   58 +-
 framework/Imap_Client/package.xml                                 |   14 +-
 framework/Kolab_Format/package.xml                                |   21 +-
 .../Queue/migration/Horde/Queue/1_horde_queue_base_tables.php     |    2 +-
 framework/Queue/package.xml                                       |   21 +-
 framework/Smtp/doc/Horde/Smtp/UPGRADING                           |   11 +
 framework/Smtp/lib/Horde/Smtp.php                                 |   33 +-
 framework/Smtp/lib/Horde/Smtp/Connection.php                      |    9 +-
 framework/Smtp/package.xml                                        |   39 +-
 framework/Support/package.xml                                     |   23 +-
 framework/Url/package.xml                                         |    2 +-
 horde/config/conf.xml                                             |    4 +-
 horde/docs/CHANGES                                                |    2 +
 horde/docs/RELEASE_NOTES                                          |   10 +-
 horde/lib/Application.php                                         |    2 +-
 horde/lib/Prefs/Special/Activesync.php                            |    2 +-
 horde/package.xml                                                 |    6 +-
 imp/docs/CHANGES                                                  |    2 +
 imp/js/compose-dimp.js                                            |    3 -
 imp/js/dimpcore.js                                                |    4 +
 imp/js/message-dimp.js                                            |    3 -
 imp/js/signaturehtml.js                                           |    9 +-
 imp/js/smartmobile.js                                             |   47 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php                      |    3 +-
 imp/lib/Ajax/Queue.php                                            |   15 +-
 imp/lib/Compose.php                                               |    6 +-
 imp/lib/Imap/Tree.php                                             |    1 +
 imp/lib/Prefs/Identity.php                                        |    2 +-
 imp/lib/Prefs/Special/HtmlSignature.php                           |    3 +
 imp/lib/Script/Package/ComposeBase.php                            |    1 -
 imp/package.xml                                                   |    2 +
 imp/themes/default/smartmobile/screen.css                         |    3 +
 kronolith/docs/CHANGES                                            |   11 +-
 kronolith/lib/Application.php                                     |    2 +-
 kronolith/lib/Event.php                                           |   12 +
 kronolith/lib/Event/Sql.php                                       |    1 +
 kronolith/package.xml                                             |   29 +-
 whups/docs/CHANGES                                                |    2 +
 whups/docs/RELEASE_NOTES                                          |   12 +-
 whups/lib/Form/Renderer/Comment.php                               |    5 +-
 whups/lib/Form/TicketDetails.php                                  |    7 +-
 whups/lib/Ticket.php                                              |   33 +-
 whups/lib/Whups.php                                               |   64 +-
 whups/package.xml                                                 |   16 +-
 whups/templates/ticket/attachments.html.php                       |   26 +
 whups/ticket/attachments.php                                      |   62 +
 wicked/docs/CHANGES                                               |    6 -
 wicked/docs/RELEASE_NOTES                                         |   17 +-
 wicked/package.xml                                                |   22 +-
 87 files changed, 1548 insertions(+), 415 deletions(-)

http://github.com/horde/horde/commit/b82cd461c8711fe368229fd788137dd2d15cdc8a
http://git.horde.org/horde-git/-/commit/b82cd461c8711fe368229fd788137dd2d15cdc8a

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

commit 274d4431ceca55776f8167127b13e1e3c26d67a6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Nov 22 13:16:55 2013 -0500

    Cache Facebook queries for timeobject events.

 timeobjects/lib/Driver/FacebookEvents.php |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/274d4431ceca55776f8167127b13e1e3c26d67a6
http://git.horde.org/horde-git/-/commit/274d4431ceca55776f8167127b13e1e3c26d67a6

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

commit 064d893cd44b694226373b3bc52226b6202e7577
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Nov 22 13:18:48 2013 -0500

    changes

 timeobjects/docs/CHANGES |    3 ++-
 timeobjects/package.xml  |    8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

http://github.com/horde/horde/commit/064d893cd44b694226373b3bc52226b6202e7577
http://git.horde.org/horde-git/-/commit/064d893cd44b694226373b3bc52226b6202e7577

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

commit baaa69060c6269afc727e4a1437c40973d09b21b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Nov 22 16:43:05 2013 -0500

    Need to include the username in the cache key.

 timeobjects/lib/Driver/FacebookEvents.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/baaa69060c6269afc727e4a1437c40973d09b21b
http://git.horde.org/horde-git/-/commit/baaa69060c6269afc727e4a1437c40973d09b21b

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

commit 0b4fc5e18c4858f00867186c0acde22ea36ffe52
Merge: c0f3c46 baaa690
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 17 12:50:44 2013 +0100

    Merge branch 'timeobjects_2_1'

 timeobjects/docs/CHANGES                  |    3 ++-
 timeobjects/lib/Driver/FacebookEvents.php |    7 ++++++-
 timeobjects/package.xml                   |    8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

http://github.com/horde/horde/commit/0b4fc5e18c4858f00867186c0acde22ea36ffe52
http://git.horde.org/horde-git/-/commit/0b4fc5e18c4858f00867186c0acde22ea36ffe52

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

commit 7a99cdc0d345aa5b5e3dfc09ae0a7b1e23cd0550
Merge: 0b4fc5e b82cd46
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 17 12:51:49 2013 +0100

    Merge branch 'trean_1_1'

 trean/data.php                  |  101 ++++++++++++++++++++++++++++++++++
 trean/docs/CHANGES              |    3 +-
 trean/lib/Application.php       |    9 +++
 trean/lib/Bookmarks.php         |    8 ++-
 trean/lib/Data/Json.php         |  114 +++++++++++++++++++++++++++++++++++++++
 trean/package.xml               |   30 ++++++++---
 trean/templates/data/import.inc |   25 +++++++++
 7 files changed, 279 insertions(+), 11 deletions(-)

http://github.com/horde/horde/commit/7a99cdc0d345aa5b5e3dfc09ae0a7b1e23cd0550
http://git.horde.org/horde-git/-/commit/7a99cdc0d345aa5b5e3dfc09ae0a7b1e23cd0550




More information about the commits mailing list