[commits] Horde branch develop updated. 50fee9eb163810ebafe049301b88f953fa3c533d

Michael M Slusarz slusarz at horde.org
Mon Mar 19 21:30:50 UTC 2012


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

from: 03d830cc4eddbb900b8d982798fe0c57858ef5b6

03ce9f7 Fix merge
cd24c2c [jan] Fix fatal error if no external calendars are available (Bug #11079).
485ffdd Fix constant
eaa7020 Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop
50fee9e Merge branch 'master' into develop

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

commit 03ce9f7bd57264531dd928c5cb8c0a937202ccf1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Mar 16 21:10:58 2012 -0600

    Fix merge

 framework/Util/package.xml |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

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

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

commit cd24c2c51f741ccb928195ff8d0bc1b000c8850e
Author: Jan Schneider <jan at horde.org>
Date:   Mon Mar 19 22:26:05 2012 +0100

    [jan] Fix fatal error if no external calendars are available (Bug #11079).

 kronolith/docs/CHANGES              |    1 +
 kronolith/package.xml               |    2 ++
 kronolith/templates/index/index.inc |    2 --
 3 files changed, 3 insertions(+), 2 deletions(-)

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

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

commit 485ffdd6976354eb7b8a07678c5ecf4bf368919b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 19 15:28:54 2012 -0600

    Fix constant

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

http://git.horde.org/horde-git/-/commit/485ffdd6976354eb7b8a07678c5ecf4bf368919b

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

commit eaa7020e4282580022dbf4adc12b176c7c79ec3d
Merge: 03ce9f7 03d830c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 19 15:29:44 2012 -0600

    Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop

 agora/ban.php                                                     |    2 +-
 agora/deleteforum.php                                             |    2 +-
 agora/editforum.php                                               |    2 +-
 agora/forums.php                                                  |    2 +-
 agora/index.php                                                   |    2 +-
 agora/lib/Application.php                                         |    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/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/scripts/phorum2agora.php                                    |    2 +-
 agora/search.php                                                  |    2 +-
 agora/threads.php                                                 |    2 +-
 agora/view.php                                                    |    2 +-
 ansel/bin/ansel                                                   |    4 +-
 ansel/bin/ansel-convert-sql-shares-to-sqlng                       |    4 +-
 ansel/bin/ansel-exif-to-tags                                      |    4 +-
 ansel/bin/ansel-garbage-collection                                |    4 +-
 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/img.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/lib/Application.php                                         |    2 +-
 ansel/lib/Search.php                                              |    2 +-
 ansel/map_edit.php                                                |    2 +-
 ansel/migration/3_ansel_upgrade_style.php                         |    2 +-
 ansel/mobile.php                                                  |    2 +-
 ansel/package.xml                                                 |    2 +-
 ansel/perms.php                                                   |    2 +-
 ansel/preview.php                                                 |    2 +-
 ansel/protect.php                                                 |    2 +-
 ansel/report.php                                                  |    2 +-
 ansel/rss.php                                                     |    2 +-
 ansel/test/Ansel/Autoload.php                                     |    6 +-
 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                                                |    2 +-
 beatnik/delete.php                                                |    2 +-
 beatnik/editrec.php                                               |    2 +-
 beatnik/index.php                                                 |    2 +-
 beatnik/lib/Application.php                                       |    2 +-
 beatnik/lib/Driver.php                                            |    2 +-
 beatnik/listzones.php                                             |    2 +-
 beatnik/package.xml                                               |    2 +-
 beatnik/scripts/export_config.php                                 |    2 +-
 beatnik/viewzone.php                                              |    2 +-
 chora/annotate.php                                                |    2 +-
 chora/browsedir.php                                               |    2 +-
 chora/browsefile.php                                              |    2 +-
 chora/co.php                                                      |    2 +-
 chora/commit.php                                                  |    2 +-
 chora/config/conf.xml                                             |    2 +-
 chora/cvsgraph.php                                                |    2 +-
 chora/diff.php                                                    |    2 +-
 chora/history.php                                                 |    2 +-
 chora/index.php                                                   |    2 +-
 chora/lib/Application.php                                         |    4 +-
 chora/patchsets.php                                               |    2 +-
 chora/stats.php                                                   |    2 +-
 components/bin/horde-bootstrap                                    |    8 +-
 components/bin/horde-components                                   |    2 +-
 components/lib/Components.php                                     |    2 +-
 components/lib/Components/Constants.php                           |    4 +-
 components/lib/Components/Dependencies/Bootstrap.php              |   14 +-
 components/test/Components/Autoload.php                           |   10 +-
 .../test/Components/Integration/Components/Module/CiSetupTest.php |   16 +-
 .../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                      |   54 +-
 .../Components/Unit/Components/Component/DependencyListTest.php   |   12 +-
 .../test/Components/Unit/Components/Component/DependencyTest.php  |    4 +-
 .../test/Components/Unit/Components/Component/IdentifyTest.php    |   16 +-
 .../test/Components/Unit/Components/Component/ResolverTest.php    |    4 +-
 components/test/Components/Unit/Components/Config/FileTest.php    |    2 +-
 components/test/Components/Unit/Components/ConfigsTest.php        |    8 +-
 .../test/Components/Unit/Components/Helper/DocsOriginTest.php     |    8 +-
 components/test/Components/Unit/Components/Helper/RootTest.php    |   24 +-
 .../test/Components/Unit/Components/Helper/TemplatesTest.php      |   28 +-
 .../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   |    8 +-
 .../test/Components/Unit/Components/Module/SnapshotTest.php       |    8 +-
 components/test/Components/Unit/Components/Module/UpdateTest.php  |    4 +-
 .../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     |    4 +-
 components/test/Components/Unit/ComponentsTest.php                |   10 +-
 content/app/controllers/ApplicationController.php                 |    2 +-
 content/bin/content-object-add                                    |    4 +-
 content/bin/content-object-delete                                 |    4 +-
 content/bin/content-tag                                           |    4 +-
 content/bin/content-tag-add                                       |    4 +-
 content/bin/content-tag-delete                                    |    4 +-
 content/bin/content-untag                                         |    4 +-
 content/lib/Application.php                                       |    2 +-
 content/package.xml                                               |    2 +-
 content/test/Content/Autoload.php                                 |    2 +-
 content/test/Content/Base.php                                     |    2 +-
 content/test/Content/Sql/Base.php                                 |    4 +-
 content/test/Content/Sql/MysqlTest.php                            |    4 +-
 content/test/Content/Sql/MysqliTest.php                           |    4 +-
 content/test/Content/Sql/Pdo/MysqlTest.php                        |    4 +-
 content/test/Content/Sql/Pdo/PgsqlTest.php                        |    4 +-
 content/test/Content/Sql/Pdo/SqliteTest.php                       |    2 +-
 folks/account/approve.php                                         |    2 +-
 folks/account/renew.php                                           |    2 +-
 folks/account/resetpassword.php                                   |    2 +-
 folks/account/signup.php                                          |    2 +-
 folks/account/tabs.php                                            |    2 +-
 folks/account/username.php                                        |    2 +-
 folks/activity.php                                                |    2 +-
 folks/birthday.php                                                |    2 +-
 folks/edit/activity.php                                           |    2 +-
 folks/edit/comments.php                                           |    2 +-
 folks/edit/edit.php                                               |    2 +-
 folks/edit/facebook.php                                           |    2 +-
 folks/edit/friends/add.php                                        |    2 +-
 folks/edit/friends/approve.php                                    |    2 +-
 folks/edit/friends/blacklist.php                                  |    2 +-
 folks/edit/friends/for.php                                        |    2 +-
 folks/edit/friends/friends.php                                    |    2 +-
 folks/edit/friends/from.php                                       |    2 +-
 folks/edit/friends/groups.php                                     |    2 +-
 folks/edit/friends/index.php                                      |    2 +-
 folks/edit/friends/invite.php                                     |    2 +-
 folks/edit/friends/know.php                                       |    2 +-
 folks/edit/friends/of.php                                         |    2 +-
 folks/edit/friends/reject.php                                     |    2 +-
 folks/edit/password.php                                           |    2 +-
 folks/edit/privacy.php                                            |    2 +-
 folks/friends.php                                                 |    2 +-
 folks/index.php                                                   |    2 +-
 folks/lib/Api.php                                                 |   32 +-
 folks/lib/Application.php                                         |   14 +-
 folks/lib/Block/Activities.php                                    |    2 +-
 folks/lib/Block/Friends.php                                       |    2 +-
 folks/lib/Block/Know.php                                          |    2 +-
 folks/lib/Block/New.php                                           |    2 +-
 folks/lib/Block/Random.php                                        |    2 +-
 folks/lib/Block/Recent.php                                        |    2 +-
 folks/lib/Driver.php                                              |    2 +-
 folks/lib/Friends.php                                             |    2 +-
 folks/lib/Friends/shared.php                                      |    2 +-
 folks/lib/base.php                                                |    4 +-
 folks/list.php                                                    |    2 +-
 folks/login.php                                                   |    2 +-
 folks/new.php                                                     |    2 +-
 folks/online.php                                                  |    2 +-
 folks/perms.php                                                   |    2 +-
 folks/popularity.php                                              |    2 +-
 folks/report.php                                                  |    2 +-
 folks/rss/activity.php                                            |    2 +-
 folks/rss/friends.php                                             |    2 +-
 folks/rss/know.php                                                |    2 +-
 folks/rss/online.php                                              |    2 +-
 folks/save_search.php                                             |    2 +-
 folks/scripts/activity.php                                        |    2 +-
 folks/scripts/import_letter.php                                   |    2 +-
 folks/scripts/mail-filter.php                                     |    2 +-
 folks/scripts/mail.php                                            |    2 +-
 folks/scripts/popularity.php                                      |    2 +-
 folks/search.php                                                  |    2 +-
 folks/services.php                                                |    2 +-
 folks/user.php                                                    |    2 +-
 framework/ActiveSync/doc/Horde/ActiveSync/TODO                    |   17 +
 framework/ActiveSync/doc/Horde/ActiveSync/UPGRADING               |   56 +
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |  195 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php  |   46 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php  |  132 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php         |  504 +-
 .../ActiveSync/lib/Horde/ActiveSync/Exception/StaleState.php      |   12 +
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php         |  101 +
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php   |   68 +
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |  306 +
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |  491 ++
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php        |  566 ++
 .../ActiveSync/lib/Horde/ActiveSync/Interface/ImapFactory.php     |   32 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Attachment.php  |   53 +
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php        |    1 -
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Folder.php      |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Message/Mail.php        |  127 +
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php        |  170 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php      |   17 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php  |   23 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment   |   38 -
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php     |   52 +
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetHierarchy.php      |    4 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php   |   44 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php   |  132 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Notify.php      |   73 -
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php        |  207 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php   |   24 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php      |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/SendMail.php    |   12 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/SmartForward.php      |   55 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/SmartReply.php  |   54 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |  117 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php          |  110 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/File.php          |  681 ---
 framework/ActiveSync/lib/Horde/ActiveSync/State/History.php       | 1141 ----
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           | 1361 +++++
 framework/ActiveSync/lib/Horde/ActiveSync/Sync.php                |  147 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Translation.php         |   50 +
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php               |   30 +-
 .../Horde/ActiveSync/5_horde_activesync_addpendingfield.php       |   17 +
 .../migration/Horde/ActiveSync/6_horde_activesync_addmailmap.php  |   26 +
 .../migration/Horde/ActiveSync/7_horde_activesync_clearstate.php  |   19 +
 framework/ActiveSync/package.xml                                  |   62 +-
 framework/ActiveSync/test/Horde/ActiveSync/AppointmentTest.php    |   14 +-
 framework/ActiveSync/test/Horde/ActiveSync/FolderSyncTest.php     |  Bin 4459 -> 4449 bytes
 framework/ActiveSync/test/Horde/ActiveSync/HordeDriverTest.php    |   13 +-
 framework/Alarm/lib/Horde/Alarm.php                               |    2 +-
 framework/Alarm/lib/Horde/Alarm/Translation.php                   |    4 +-
 framework/Alarm/package.xml                                       |    2 +-
 framework/Alarm/test/Horde/Alarm/SqlTest.php                      |    2 +-
 framework/Argv/lib/Horde/Argv/Translation.php                     |    4 +-
 framework/Argv/package.xml                                        |    2 +-
 framework/Argv/test/Horde/Argv/BoolTest.php                       |    2 +-
 framework/Argv/test/Horde/Argv/CallbackCheckAbbrevTest.php        |    2 +-
 framework/Argv/test/Horde/Argv/CallbackExtraArgsTest.php          |    2 +-
 framework/Argv/test/Horde/Argv/CallbackManyArgsTest.php           |    2 +-
 framework/Argv/test/Horde/Argv/CallbackMeddleArgsTest.php         |    2 +-
 framework/Argv/test/Horde/Argv/CallbackTest.php                   |    2 +-
 framework/Argv/test/Horde/Argv/CallbackVarArgsTest.php            |    4 +-
 framework/Argv/test/Horde/Argv/ChoiceTest.php                     |    2 +-
 framework/Argv/test/Horde/Argv/ConflictOverrideTest.php           |    2 +-
 framework/Argv/test/Horde/Argv/ConflictResolveTest.php            |    2 +-
 framework/Argv/test/Horde/Argv/ConflictTest.php                   |    2 +-
 framework/Argv/test/Horde/Argv/ConflictingDefaultsTest.php        |    2 +-
 framework/Argv/test/Horde/Argv/CountTest.php                      |    2 +-
 framework/Argv/test/Horde/Argv/DefaultValuesTest.php              |    2 +-
 framework/Argv/test/Horde/Argv/ExpandDefaultsTest.php             |    2 +-
 framework/Argv/test/Horde/Argv/ExtendAddActionsTest.php           |    2 +-
 framework/Argv/test/Horde/Argv/ExtendAddTypesTest.php             |    2 +-
 framework/Argv/test/Horde/Argv/HelpTest.php                       |    2 +-
 framework/Argv/test/Horde/Argv/InterceptingParser.php             |    2 +-
 framework/Argv/test/Horde/Argv/MatchAbbrevTest.php                |    2 +-
 framework/Argv/test/Horde/Argv/MultipleArgsAppendTest.php         |    2 +-
 framework/Argv/test/Horde/Argv/MultipleArgsTest.php               |    2 +-
 framework/Argv/test/Horde/Argv/OptionChecksTest.php               |    2 +-
 framework/Argv/test/Horde/Argv/OptionGroupTest.php                |    2 +-
 framework/Argv/test/Horde/Argv/OptionValuesTest.php               |    2 +-
 framework/Argv/test/Horde/Argv/ParseNumTest.php                   |    2 +-
 framework/Argv/test/Horde/Argv/ParserTest.php                     |    2 +-
 framework/Argv/test/Horde/Argv/ProgNameTest.php                   |    2 +-
 framework/Argv/test/Horde/Argv/StandardTest.php                   |    2 +-
 framework/Argv/test/Horde/Argv/TypeAliasesTest.php                |    2 +-
 framework/Argv/test/Horde/Argv/VersionTest.php                    |    4 +-
 framework/Auth/lib/Horde/Auth/Translation.php                     |    4 +-
 framework/Auth/test/Horde/Auth/Autoload.php                       |    2 +-
 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                |    4 +-
 framework/Auth/test/Horde/Auth/Unit/Sql/Base.php                  |    4 +-
 framework/Auth/test/Horde/Auth/Unit/Sql/Locks.php                 |   10 +-
 framework/Auth/test/Horde/Auth/Unit/Sql/Pdo/SqliteLockTest.php    |    2 +-
 framework/Auth/test/Horde/Auth/Unit/Sql/Pdo/SqliteTest.php        |    2 +-
 framework/Autoloader/package.xml                                  |    2 +-
 framework/Autoloader_Cache/package.xml                            |    2 +-
 framework/Browser/lib/Horde/Browser/Translation.php               |    4 +-
 framework/Browser/package.xml                                     |    2 +-
 framework/Cli/lib/Horde/Cli/Translation.php                       |    4 +-
 framework/Cli/package.xml                                         |    2 +-
 framework/Cli_Modular/doc/Horde/Cli/Modular/README                |    2 +-
 framework/Cli_Modular/package.xml                                 |    2 +-
 framework/Cli_Modular/test/Horde/Cli/Modular/Autoload.php         |    8 +-
 framework/Cli_Modular/test/Horde/Cli/Modular/Unit/ModularTest.php |   10 +-
 .../test/Horde/Cli/Modular/Unit/ModuleProviderTest.php            |    2 +-
 framework/Cli_Modular/test/Horde/Cli/Modular/Unit/ModulesTest.php |   12 +-
 framework/Compress/lib/Horde/Compress/Translation.php             |    4 +-
 framework/Compress/package.xml                                    |    2 +-
 framework/Constraint/package.xml                                  |    2 +-
 framework/Constraint/test/Horde/Constraint/AllTests.php           |    2 +-
 framework/Controller/package.xml                                  |    2 +-
 framework/Controller/test/Horde/Controller/FilterRunnerTest.php   |    2 +-
 framework/Controller/test/Horde/Controller/MockRequestTest.php    |    2 +-
 framework/Controller/test/Horde/Controller/StreamTest.php         |    2 +-
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php            |  119 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |  821 ++-
 framework/Core/lib/Horde/Core/ActiveSync/Imap/Factory.php         |   56 +
 framework/Core/lib/Horde/Core/Factory/ActiveSyncBackend.php       |   11 +-
 framework/Core/lib/Horde/Core/Factory/ActiveSyncServer.php        |    8 +-
 framework/Core/lib/Horde/Core/Factory/ActiveSyncState.php         |    9 +-
 framework/Core/lib/Horde/Core/Translation.php                     |    4 +-
 framework/Core/lib/Horde/Session/Null.php                         |    4 -
 framework/Core/package.xml                                        |    4 +
 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/UrlTest.php                        |    2 +-
 framework/Crypt/lib/Horde/Crypt/Translation.php                   |    4 +-
 framework/Crypt/test/Horde/Crypt/PgpTest.php                      |   32 +-
 framework/Crypt/test/Horde/Crypt/SmimeTest.php                    |    2 +-
 framework/Data/lib/Horde/Data/Translation.php                     |    4 +-
 framework/Data/package.xml                                        |    2 +-
 framework/Data/test/Horde/Data/CsvTest.php                        |   12 +-
 framework/DataTree/package.xml                                    |    2 +-
 framework/Date/lib/Horde/Date/Translation.php                     |    4 +-
 framework/Date/test/Horde/Date/DateTest.php                       |    2 +-
 framework/Date/test/Horde/Date/RecurrenceTest.php                 |    4 +-
 framework/Date/test/Horde/Date/SpanTest.php                       |    2 +-
 framework/Date/test/Horde/Date/UtilsTest.php                      |    2 +-
 framework/Date_Parser/doc/Horde/Date/Parser/examples/parse.php    |    2 +-
 framework/Date_Parser/lib/Horde/Date/Parser.php                   |    2 +-
 framework/Date_Parser/package.xml                                 |    2 +-
 framework/Db/test/Horde/Db/Adapter/MysqlSuite.php                 |    8 +-
 framework/Db/test/Horde/Db/Adapter/MysqlTest.php                  |    6 +-
 framework/Db/test/Horde/Db/Adapter/MysqliSuite.php                |    8 +-
 framework/Db/test/Horde/Db/Adapter/MysqliTest.php                 |    6 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php             |    8 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php              |    6 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php             |    8 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php              |    2 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php            |    8 +-
 framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php             |    6 +-
 framework/Db/test/Horde/Db/AllTests.php                           |    6 +-
 framework/Db/test/Horde/Db/Migration/BaseTest.php                 |    6 +-
 framework/Db/test/Horde/Db/Migration/MigratorTest.php             |   18 +-
 framework/Db/test/Horde/Db/StatementParserTest.php                |    2 +-
 framework/Editor/package.xml                                      |    2 +-
 framework/ElasticSearch/package.xml                               |    2 +-
 framework/Exception/lib/Horde/Exception/Translation.php           |    4 +-
 framework/Exception/test/Horde/Exception/ExceptionTest.php        |    6 +-
 framework/Feed/package.xml                                        |    2 +-
 framework/Feed/test/Horde/Feed/AtomEntryOnlyTest.php              |    4 +-
 framework/Feed/test/Horde/Feed/AtomPublishingTest.php             |    8 +-
 framework/Feed/test/Horde/Feed/BlogrollTest.php                   |    4 +-
 framework/Feed/test/Horde/Feed/CountTest.php                      |    4 +-
 framework/Feed/test/Horde/Feed/IteratorTest.php                   |    6 +-
 framework/Feed/test/Horde/Feed/LexiconTest.php                    |    4 +-
 framework/Feed/test/Horde/Feed/ReadTest.php                       |    4 +-
 .../Horde/Feed/fixtures/lexicon/http-derickrethans.nl-rss.xml     |    2 +-
 framework/Form/lib/Horde/Form/Translation.php                     |    4 +-
 framework/Form/package.xml                                        |    2 +-
 framework/Form/test/Horde_Form_Type_address.phpt                  |    2 +-
 framework/Form/test/Horde_Form_Type_email.phpt                    |    2 +-
 framework/Group/package.xml                                       |    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                     |    4 +-
 framework/Group/test/Horde/Group/Sql/MysqlTest.php                |    4 +-
 framework/Group/test/Horde/Group/Sql/MysqliTest.php               |    4 +-
 framework/Group/test/Horde/Group/Sql/Pdo/MysqlTest.php            |    4 +-
 framework/Group/test/Horde/Group/Sql/Pdo/PgsqlTest.php            |    4 +-
 framework/Group/test/Horde/Group/Sql/Pdo/SqliteTest.php           |    2 +-
 framework/History/package.xml                                     |    2 +-
 framework/History/test/Horde/History/InterfaceTest.php            |    2 +-
 framework/Http/package.xml                                        |    2 +-
 framework/Http/test/Horde/Http/ClientTest.php                     |    2 +-
 framework/Http/test/Horde/Http/CurlTest.php                       |    2 +-
 framework/Http/test/Horde/Http/FopenTest.php                      |    2 +-
 framework/Http/test/Horde/Http/MockTest.php                       |    2 +-
 framework/Icalendar/lib/Horde/Icalendar/Translation.php           |    4 +-
 framework/Icalendar/package.xml                                   |    2 +-
 framework/Icalendar/test/Horde/Icalendar/bug_7423.phpt            |    2 +-
 framework/Icalendar/test/Horde/Icalendar/charset1.phpt            |    2 +-
 framework/Icalendar/test/Horde/Icalendar/common.php               |   22 +-
 framework/Icalendar/test/Horde/Icalendar/empty_data.phpt          |    2 +-
 framework/Icalendar/test/Horde/Icalendar/geo.phpt                 |    2 +-
 framework/Icalendar/test/Horde/Icalendar/iCalendar.phpt           |    2 +-
 framework/Icalendar/test/Horde/Icalendar/line-folding.phpt        |    2 +-
 framework/Icalendar/test/Horde/Icalendar/quoted-params.phpt       |    2 +-
 framework/Icalendar/test/Horde/Icalendar/read-escapes.phpt        |    2 +-
 framework/Icalendar/test/Horde/Icalendar/read-vcard-org.phpt      |    2 +-
 framework/Icalendar/test/Horde/Icalendar/read-write-escapes.phpt  |    2 +-
 framework/Icalendar/test/Horde/Icalendar/timezones.phpt           |    4 +-
 framework/Icalendar/test/Horde/Icalendar/vcal20.phpt              |    2 +-
 framework/Icalendar/test/Horde/Icalendar/vfreebusy.phpt           |    2 +-
 framework/Icalendar/test/Horde/Icalendar/write-escapes.phpt       |    2 +-
 framework/Image/lib/Horde/Image.php                               |    4 +-
 framework/Image/lib/Horde/Image/Base.php                          |    2 +-
 framework/Image/lib/Horde/Image/Translation.php                   |    4 +-
 framework/Image/package.xml                                       |    2 +-
 framework/Image/test/Horde/Image/Exif/Base.php                    |    4 +-
 framework/Image/test/Horde/Image/Exif/BundledTest.php             |    4 +-
 framework/Image/test/Horde/Image/Exif/ExiftoolTest.php            |    4 +-
 framework/Image/test/Horde/Image/Exif/PhpTest.php                 |    4 +-
 framework/Image/test/im.php                                       |    2 +-
 framework/Image/test/runtest.php                                  |    2 +-
 framework/Image/test/svg.php                                      |    2 +-
 framework/Image/test/swf.php                                      |    2 +-
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING             |    3 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Translation.php       |    4 +-
 framework/Imap_Client/test/Horde/Imap/Client/AuthTest.php         |    2 +-
 framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php       |    4 +-
 framework/Imap_Client/test/Horde/Imap/Client/test_client.php      |    2 +-
 framework/Imsp/lib/Horde/Imsp/Translation.php                     |    4 +-
 framework/Imsp/package.xml                                        |    2 +-
 framework/Injector/package.xml                                    |    2 +-
 framework/Itip/lib/Horde/Itip/Translation.php                     |    4 +-
 framework/Itip/package.xml                                        |    2 +-
 framework/Itip/test/Horde/Itip/Autoload.php                       |    2 +-
 framework/Itip/test/Horde/Itip/Integration/ItipTest.php           |    2 +-
 framework/Itip/test/Horde/Itip/Unit/Event/VeventTest.php          |    2 +-
 framework/Itip/test/Horde/Itip/Unit/Response/Type/BaseTest.php    |    2 +-
 framework/Kolab/Kolab/Translation.php                             |    4 +-
 framework/Kolab/package.xml                                       |    2 +-
 framework/Kolab_Cli/bin/horde-kolab-cli                           |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli.php                       |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Translation.php           |    4 +-
 framework/Kolab_Cli/package.xml                                   |    2 +-
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Autoload.php             |    2 +-
 .../Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/Data/LedgerTest.php   |    4 +-
 .../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 |    3 +-
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/CliTest.php         |    3 +-
 framework/Kolab_Config/package.xml                                |    2 +-
 framework/Kolab_Config/test/Horde/Kolab/Config/AllTests.php       |    2 +-
 framework/Kolab_Config/test/Horde/Kolab/Config/Autoload.php       |    2 +-
 .../Kolab_Config/test/Horde/Kolab/Config/ConfigStoryTestCase.php  |    6 +-
 .../test/Horde/Kolab/Config/Integration/ConfigTest.php            |    4 +-
 framework/Kolab_Filter/TODO                                       |   34 -
 framework/Kolab_Filter/doc/Horde/Kolab/Filter/TODO                |   34 +
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php         |    6 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php        |    4 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport.php       |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lda.php   |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php  |    2 +-
 framework/Kolab_Filter/package.xml                                |    8 +-
 framework/Kolab_Filter/test/Horde/Kolab/Filter/AllTests.php       |    2 +-
 framework/Kolab_Filter/test/Horde/Kolab/Filter/Autoload.php       |   30 +-
 framework/Kolab_Filter/test/Horde/Kolab/Filter/ContentTestOld.php |   54 +-
 .../Kolab_Filter/test/Horde/Kolab/Filter/Integration/CliTest.php  |    7 +-
 .../test/Horde/Kolab/Filter/Integration/IncomingTest.php          |   10 +-
 .../Kolab_Filter/test/Horde/Kolab/Filter/ResourceTestOld.php      |   32 +-
 .../test/Horde/Kolab/Filter/Unit/Helper/AddressFilter.php         |    2 +-
 framework/Kolab_Format/package.xml                                |    2 +-
 framework/Kolab_Format/test/Horde/Kolab/Format/Autoload.php       |   34 +-
 .../test/Horde/Kolab/Format/Integration/ContactTest.php           |   10 +-
 .../test/Horde/Kolab/Format/Integration/EventTest.php             |    6 +-
 .../test/Horde/Kolab/Format/Integration/PreferencesTest.php       |    8 +-
 .../test/Horde/Kolab/Format/Integration/RecurrenceTest.php        |   12 +-
 .../Kolab_Format/test/Horde/Kolab/Format/Integration/TaskTest.php |    4 +-
 .../Kolab_Format/test/Horde/Kolab/Format/Integration/XmlTest.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/TODO                                     |    3 -
 framework/Kolab_FreeBusy/doc/Horde/Kolab/FreeBusy/TODO            |    3 +
 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Translation.php |    4 +-
 framework/Kolab_FreeBusy/package.xml                              |   12 +-
 framework/Kolab_FreeBusy/test/Horde/Kolab/FreeBusy/Autoload.php   |   12 +-
 .../test/Horde/Kolab/FreeBusy/Integration/DispatchTest.php        |    2 +-
 .../test/Horde/Kolab/FreeBusy/Integration/RedirectTest.php        |    2 +-
 .../test/Horde/Kolab/FreeBusy/Integration/TriggerTest.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    |   10 +-
 .../Horde/Kolab/FreeBusy/Unit/Freebusy/Helper/StatusMapTest.php   |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Freebusy/Params/FolderTest.php |    2 +-
 .../test/Horde/Kolab/FreeBusy/Unit/Object/EventTest.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     |    4 +-
 .../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/freebusy.php    |    2 +-
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy.php    |    2 +-
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Translation.php |    4 +-
 framework/Kolab_Resource/package.xml                              |    2 +-
 framework/Kolab_Resource/test/Horde/Kolab/Resource/Autoload.php   |    2 +-
 framework/Kolab_Server/package.xml                                |    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            |    2 +-
 .../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       |   14 +-
 framework/Kolab_Session/package.xml                               |    2 +-
 framework/Kolab_Session/test/Horde/Kolab/Session/Autoload.php     |    6 +-
 .../test/Horde/Kolab/Session/Integration/AnonymousTest.php        |    2 +-
 .../test/Horde/Kolab/Session/Integration/ValidTest.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/lib/Horde/Kolab/Storage/Translation.php   |    4 +-
 framework/Kolab_Storage/package.xml                               |    2 +-
 framework/Kolab_Storage/test/Horde/Kolab/Storage/AllTests.php     |    2 +-
 framework/Kolab_Storage/test/Horde/Kolab/Storage/Autoload.php     |    6 +-
 framework/Kolab_Storage/test/Horde/Kolab/Storage/Scenario.php     |    4 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Server/DriverTest.php  |    2 +-
 framework/Kolab_Storage/test/Horde/Kolab/Storage/TestCase.php     |    4 +-
 .../test/Horde/Kolab/Storage/Unit/Cache/DataTest.php              |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Cache/ListTest.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 |    4 +-
 .../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/Format/MimeTest.php        |    6 +-
 .../test/Horde/Kolab/Storage/Unit/Data/Parser/StructureTest.php   |    4 +-
 .../test/Horde/Kolab/Storage/Unit/Data/Query/History/BaseTest.php |    6 +-
 .../Horde/Kolab/Storage/Unit/Data/Query/Preferences/BaseTest.php  |    6 +-
 .../Horde/Kolab/Storage/Unit/Data/Query/Preferences/CacheTest.php |    6 +-
 .../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/NamespaceTest.php        |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Folder/Stamp/UidsTest.php       |    2 +-
 .../test/Horde/Kolab/Storage/Unit/Folder/TypeTest.php             |    2 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/BaseTest.php |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php    |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/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 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/List/CacheTest.php   |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/Share/BaseTest.php   |    2 +-
 .../test/Horde/Kolab/Storage/Unit/List/Query/Share/CacheTest.php  |    2 +-
 .../test/Horde/Kolab/Storage/Unit/QuerySet/UncachedTest.php       |    2 +-
 .../test/Horde/Kolab/Storage/Unit/SynchronizationTest.php         |    2 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/UncachedTest.php  |    2 +-
 framework/Ldap/package.xml                                        |    2 +-
 framework/Ldap/test/Horde/Ldap/LdapTest.php                       |    2 +-
 framework/Ldap/test/Horde/Ldap/LdifTest.php                       |   32 +-
 framework/Ldap/test/Horde/Ldap/SearchTest.php                     |    2 +-
 framework/Ldap/test/Horde/Ldap/UtilTest.php                       |    2 +-
 framework/Lens/package.xml                                        |    2 +-
 framework/ListHeaders/package.xml                                 |    2 +-
 framework/Lock/package.xml                                        |    2 +-
 framework/Log/package.xml                                         |    2 +-
 framework/LoginTasks/lib/Horde/LoginTasks/Translation.php         |    4 +-
 framework/LoginTasks/package.xml                                  |    2 +-
 framework/LoginTasks/test/Horde/LoginTasks/Autoload.php           |    2 +-
 framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php     |    2 +-
 framework/Mail/package.xml                                        |    2 +-
 framework/Memcache/package.xml                                    |    2 +-
 framework/Mime/lib/Horde/Mime/Magic.php                           |    2 +-
 framework/Mime/lib/Horde/Mime/Mail.php                            |    6 +-
 framework/Mime/lib/Horde/Mime/Part.php                            |    7 +-
 framework/Mime/lib/Horde/Mime/Translation.php                     |    4 +-
 framework/Mime/package.xml                                        |    2 +-
 framework/Mime/test/Horde/Mime/HeadersTest.php                    |    2 +-
 framework/Mime/test/Horde/Mime/MagicTest.php                      |    4 +-
 framework/Mime/test/Horde/Mime/MailTest.php                       |   53 +-
 framework/Mime/test/Horde/Mime/MimeTest.php                       |    4 +-
 framework/Mime/test/Horde/Mime/PartTest.php                       |    6 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Ooo.php               |    2 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Translation.php       |    4 +-
 framework/Mime_Viewer/package.xml                                 |    2 +-
 framework/Mime_Viewer/test/Horde/Mime/Viewer/url.phpt             |    2 +-
 framework/Model/lib/Horde/Model/Translation.php                   |    4 +-
 framework/Nls/lib/Horde/Nls.php                                   |    6 +-
 framework/Nls/lib/Horde/Nls/Translation.php                       |    4 +-
 framework/Nls/package.xml                                         |    2 +-
 framework/Notification/package.xml                                |    2 +-
 .../Horde/Notification/Class/Notification/Event/StatusTest.php    |    4 +-
 .../test/Horde/Notification/Class/Notification/EventTest.php      |    4 +-
 .../Class/Notification/Handler/Decorator/AlarmTest.php            |    4 +-
 .../Class/Notification/Handler/Decorator/HordelogTest.php         |    4 +-
 .../Notification/Class/Notification/Handler/Decorator/LogTest.php |    4 +-
 .../test/Horde/Notification/Class/Notification/HandlerTest.php    |    4 +-
 .../Horde/Notification/Class/Notification/Listener/AudioTest.php  |    4 +-
 .../Horde/Notification/Class/Notification/Listener/StatusTest.php |    4 +-
 .../test/Horde/Notification/Class/Notification/ListenerTest.php   |    4 +-
 .../test/Horde/Notification/Class/NotificationTest.php            |    4 +-
 framework/Oauth/package.xml                                       |    2 +-
 framework/Pdf/package.xml                                         |    2 +-
 framework/Pdf/test/Horde/Pdf/WriterTest.php                       |    6 +-
 framework/Pear/package.xml                                        |    2 +-
 framework/Pear/test/Horde/Pear/Autoload.php                       |    4 +-
 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 +-
 .../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 +-
 .../Pear/Unit/Package/Contents/InstallAs/HordeApplicationTest.php |    4 +-
 .../test/Horde/Pear/Unit/Package/Contents/InstallAs/HordeTest.php |    4 +-
 framework/Pear/test/Horde/Pear/Unit/Package/Contents/ListTest.php |    4 +-
 framework/Pear/test/Horde/Pear/Unit/Package/DependenciesTest.php  |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Package/Type/HordeTest.php    |    4 +-
 framework/Pear/test/Horde/Pear/Unit/Package/Xml/DirectoryTest.php |    4 +-
 framework/Pear/test/Horde/Pear/Unit/Package/XmlTest.php           |   28 +-
 framework/Pear/test/Horde/Pear/Unit/RegistryTest.php              |    2 +-
 framework/Pear/test/Horde/Pear/Unit/RemoteTest.php                |    4 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/AccessTest.php           |    4 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/DependenciesTest.php     |    6 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/PackageListTest.php      |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/PackageTest.php          |    6 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/ReleaseTest.php          |    2 +-
 framework/Pear/test/Horde/Pear/Unit/Rest/ReleasesTest.php         |    6 +-
 framework/Pear/test/Horde/Pear/Unit/RestTest.php                  |    2 +-
 framework/Perms/lib/Horde/Perms/Translation.php                   |    4 +-
 framework/Perms/package.xml                                       |    2 +-
 framework/Prefs/bin/horde-prefs                                   |    2 +-
 framework/Prefs/lib/Horde/Prefs/Translation.php                   |    4 +-
 framework/Prefs/package.xml                                       |    2 +-
 framework/Prefs/test/Horde/Prefs/Autoload.php                     |    2 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/FileTest.php        |    4 +-
 .../Prefs/test/Horde/Prefs/Unit/Storage/KolabImapLogTest.php      |    4 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/KolabImapTest.php   |    4 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php        |    4 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/MysqlTest.php   |    4 +-
 framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/MysqliTest.php  |    4 +-
 .../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/MysqlTest.php     |    4 +-
 .../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/PgsqlTest.php     |    4 +-
 .../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/SqliteTest.php    |    2 +-
 framework/PubSub/package.xml                                      |    2 +-
 framework/Push/bin/horde-push                                     |    2 +-
 framework/Push/lib/Horde/Push/Translation.php                     |    4 +-
 framework/Push/package.xml                                        |    2 +-
 framework/Push/test/Horde/Push/Autoload.php                       |    4 +-
 framework/Push/test/Horde/Push/Unit/Push/CliTest.php              |    4 +-
 framework/Push/test/Horde/Push/Unit/Push/Factory/PushTest.php     |   20 +-
 .../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                  |    4 +-
 framework/Queue/package.xml                                       |    2 +-
 framework/Rampage/package.xml                                     |    2 +-
 framework/Rampage/scripts/Horde/Rampage/rampage.php               |    4 +-
 framework/Rdo/package.xml                                         |    2 +-
 framework/Rdo/test/Horde/Rdo/Autoload.php                         |   12 +-
 framework/Rdo/test/Horde/Rdo/Base.php                             |    2 +-
 framework/Rdo/test/Horde/Rdo/Sql/Base.php                         |    4 +-
 framework/Rdo/test/Horde/Rdo/Sql/Pdo/SqliteTest.php               |    2 +-
 framework/Reflection/lib/Horde/Reflection.php                     |    2 +-
 framework/Reflection/package.xml                                  |    2 +-
 framework/Release/package.xml                                     |    2 +-
 framework/Release/test/Horde/Release/Autoload.php                 |    4 +-
 .../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/package.xml                                        |    2 +-
 framework/Routes/package.xml                                      |    2 +-
 framework/Routes/test/Horde/Routes/UtilTest.php                   |    6 +-
 framework/Routes/test/Horde/Routes/UtilWithExplicitTest.php       |    2 +-
 framework/Rpc/lib/Horde/Rpc/ActiveSync.php                        |   65 +-
 framework/Rpc/lib/Horde/Rpc/Translation.php                       |    4 +-
 framework/Rpc/package.xml                                         |    2 +-
 framework/Rpc/test/rpc-test.php                                   |    2 +-
 framework/Sabre/package.xml                                       |    2 +-
 framework/Scheduler/package.xml                                   |    2 +-
 framework/Scribe/package.xml                                      |    2 +-
 framework/Secret/package.xml                                      |    2 +-
 framework/Secret/test/Horde/Secret/Autoload.php                   |    2 +-
 framework/Secret/test/Horde/Secret/Unit/SecretTest.php            |    2 +-
 framework/Serialize/test/Horde/Serialize/JsonTest.php             |    2 +-
 .../Service_Facebook/lib/Horde/Service/Facebook/Translation.php   |    4 +-
 framework/Service_Facebook/package.xml                            |    2 +-
 framework/Service_Gravatar/package.xml                            |    2 +-
 .../Service_Gravatar/test/Horde/Service/Gravatar/GravatarTest.php |    2 +-
 .../Service_Gravatar/test/Horde/Service/Gravatar/ServerTest.php   |    4 +-
 framework/Service_Scribd/lib/Horde/Service/Scribd/Translation.php |    4 +-
 framework/Service_Scribd/package.xml                              |    2 +-
 .../Service_Twitter/doc/Horde/Service/Twitter/twitter_browser.php |    2 +-
 framework/Service_Twitter/package.xml                             |    2 +-
 framework/Service_UrlShortener/package.xml                        |    2 +-
 framework/Service_Vimeo/package.xml                               |    2 +-
 .../Service_Weather/lib/Horde/Service/Weather/Translation.php     |    4 +-
 framework/Service_Weather/package.xml                             |    2 +-
 .../Service_Weather/test/Horde/Service/Weather/GoogleTest.php     |    4 +-
 .../test/Horde/Service/Weather/WundergroundTest.php               |    5 +-
 framework/Service_Weather/test/Horde/Service/Weather/WwoTest.php  |    4 +-
 framework/Share/lib/Horde/Share/Translation.php                   |    4 +-
 framework/Share/package.xml                                       |    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                     |    4 +-
 framework/Share/test/Horde/Share/Sql/MysqlTest.php                |    4 +-
 framework/Share/test/Horde/Share/Sql/MysqliTest.php               |    4 +-
 framework/Share/test/Horde/Share/Sql/Pdo/MysqlTest.php            |    4 +-
 framework/Share/test/Horde/Share/Sql/Pdo/PgsqlTest.php            |    4 +-
 framework/Share/test/Horde/Share/Sql/Pdo/SqliteTest.php           |    2 +-
 framework/Share/test/Horde/Share/Sqlng/Base.php                   |    4 +-
 framework/Share/test/Horde/Share/Sqlng/MysqlTest.php              |    4 +-
 framework/Share/test/Horde/Share/Sqlng/MysqliTest.php             |    4 +-
 framework/Share/test/Horde/Share/Sqlng/Pdo/MysqlTest.php          |    4 +-
 framework/Share/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php          |    4 +-
 framework/Share/test/Horde/Share/Sqlng/Pdo/SqliteTest.php         |    2 +-
 framework/Share/test/Horde/Share/stress-test                      |    6 +-
 framework/SpellChecker/package.xml                                |    2 +-
 framework/Stream_Filter/package.xml                               |    2 +-
 framework/Stream_Wrapper/package.xml                              |    2 +-
 framework/Support/package.xml                                     |    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/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/Translation.php                 |    4 +-
 framework/SyncMl/package.xml                                      |    2 +-
 framework/SyncMl/test/Horde/SyncMl/sif.phpt                       |    2 +-
 framework/SyncMl/test/Horde/SyncMl/testsync.php                   |    2 +-
 framework/Template/package.xml                                    |    2 +-
 framework/Template/test/Horde/Template/Autoload.php               |   29 +-
 framework/Template/test/Horde/Template/TemplateTest.php           |    6 +-
 framework/Text_Diff/package.xml                                   |    2 +-
 framework/Text_Diff/test/Horde/Text/Diff/EngineTest.php           |   12 +-
 framework/Text_Diff/test/Horde/Text/Diff/RendererTest.php         |    4 +-
 framework/Text_Diff/test/Horde/Text/Diff/ThreeWayTest.php         |    4 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Translation.php       |    4 +-
 framework/Text_Filter/package.xml                                 |    2 +-
 framework/Text_Filter/test/Horde/Text/Filter/LinkurlsTest.php     |    2 +-
 framework/Text_Filter_Csstidy/lib/Horde/Text/Filter/Csstidy.php   |    2 +-
 framework/Text_Filter_Csstidy/package.xml                         |    2 +-
 framework/Text_Flowed/package.xml                                 |    2 +-
 framework/Text_Textile/package.xml                                |    2 +-
 framework/Text_Textile/test/Horde/Text/Textile/AttributesTest.php |    2 +-
 .../Text_Textile/test/Horde/Text/Textile/BlockModifiersTest.php   |    2 +-
 .../test/Horde/Text/Textile/ExternalReferencesTest.php            |    2 +-
 framework/Text_Textile/test/Horde/Text/Textile/ListsTest.php      |    2 +-
 .../Text_Textile/test/Horde/Text/Textile/PhraseModifiersTest.php  |    2 +-
 framework/Text_Textile/test/Horde/Text/Textile/TablesTest.php     |    2 +-
 framework/Text_Textile/test/Horde/Text/Textile/TestCase.php       |    2 +-
 framework/Text_Textile/test/Horde/Text/Textile/WritingTest.php    |    2 +-
 framework/Thrift/lib/Horde/Thrift/thrift_root/Thrift.php          |    2 +-
 framework/Thrift/package.xml                                      |    2 +-
 framework/Timezone/package.xml                                    |    2 +-
 framework/Timezone/test/Horde/Timezone/IcalendarTest.php          |    6 +-
 framework/Token/lib/Horde/Token/Translation.php                   |    4 +-
 framework/Token/test/Horde/Token/Autoload.php                     |    2 +-
 framework/Token/test/Horde/Token/Unit/FileTest.php                |    2 +-
 framework/Token/test/Horde/Token/Unit/SqlTest.php                 |    4 +-
 framework/Translation/package.xml                                 |    2 +-
 framework/Translation/test/Horde/Translation/GettextTest.php      |   10 +-
 framework/Translation/test/Horde/Translation/WrapperTest.php      |   10 +-
 framework/Tree/package.xml                                        |    2 +-
 framework/Url/package.xml                                         |    2 +-
 framework/Util/test/Horde/Util/ArrayTest.php                      |    2 +-
 framework/Util/test/Horde/Util/CsvTest.php                        |    4 +-
 framework/Util/test/Horde/Util/DomhtmlTest.php                    |    2 +-
 framework/Util/test/Horde/Util/StringTest.php                     |    2 +-
 framework/Util/test/Horde/Util/UtilTest.php                       |    2 +-
 framework/Vcs/test/Horde/Vcs/CvsTest.php                          |   20 +-
 framework/Vcs/test/Horde/Vcs/GitTest.php                          |    4 +-
 framework/Vcs/test/Horde/Vcs/RcsTest.php                          |   16 +-
 framework/Vcs/test/Horde/Vcs/SvnTest.php                          |   12 +-
 framework/Vcs/test/Horde/Vcs/TestBase.php                         |    6 +-
 framework/Vfs/lib/Horde/Vfs/Translation.php                       |    4 +-
 framework/Vfs/test/Horde/Vfs/Base.php                             |    2 +-
 framework/Vfs/test/Horde/Vfs/FileTest.php                         |    2 +-
 framework/Vfs/test/Horde/Vfs/FtpTest.php                          |    4 +-
 framework/Vfs/test/Horde/Vfs/SmbTest.php                          |    4 +-
 framework/Vfs/test/Horde/Vfs/Sql/Base.php                         |    4 +-
 framework/Vfs/test/Horde/Vfs/Sql/MysqlTest.php                    |    4 +-
 framework/Vfs/test/Horde/Vfs/Sql/MysqliTest.php                   |    4 +-
 framework/Vfs/test/Horde/Vfs/Sql/Pdo/MysqlTest.php                |    4 +-
 framework/Vfs/test/Horde/Vfs/Sql/Pdo/PgsqlTest.php                |    4 +-
 framework/Vfs/test/Horde/Vfs/Sql/Pdo/SqliteTest.php               |    2 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/Base.php                     |    4 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/MysqlTest.php                |    4 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/MysqliTest.php               |    4 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/Pdo/MysqlTest.php            |    4 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/Pdo/PgsqlTest.php            |    4 +-
 framework/Vfs/test/Horde/Vfs/SqlFile/Pdo/SqliteTest.php           |    2 +-
 framework/Vfs/test/Horde/Vfs/Ssh2Test.php                         |    4 +-
 framework/View/package.xml                                        |    2 +-
 framework/View/test/Horde/View/BaseTest.php                       |    8 +-
 framework/Xml_Element/package.xml                                 |    2 +-
 framework/Xml_Element/test/Horde/Xml/Element/CountTest.php        |    2 +-
 framework/Xml_Element/test/Horde/Xml/Element/ElementTest.php      |   14 +-
 framework/Xml_Element/test/Horde/Xml/Element/IteratorTest.php     |    2 +-
 framework/Xml_Wbxml/package.xml                                   |    2 +-
 framework/Xml_Wbxml/test/Horde/Xml/Wbxml/DecodeTest.php           |    4 +-
 framework/Yaml/doc/Horde/Yaml/examples/dump.php                   |    2 +-
 framework/Yaml/doc/Horde/Yaml/examples/load.php                   |    4 +-
 framework/Yaml/package.xml                                        |    2 +-
 framework/Yaml/test/Horde/Yaml/Autoload.php                       |    2 +-
 framework/Yaml/test/Horde/Yaml/LoaderTest.php                     |    4 +-
 framework/admintools/horde-base.php                               |    2 +-
 framework/admintools/horde-remove-pref.php                        |    2 +-
 framework/admintools/horde-sql-shell.php                          |    2 +-
 framework/admintools/package.xml                                  |    2 +-
 framework/bin/install_dev                                         |    4 +-
 framework/bin/install_framework                                   |    4 +-
 framework/bin/pear_batch_install                                  |    2 +-
 framework/bin/test_framework                                      |    4 +-
 framework/devtools/package.xml                                    |    2 +-
 gollem/clipboard.php                                              |    2 +-
 gollem/edit.php                                                   |    2 +-
 gollem/index.php                                                  |    2 +-
 gollem/lib/Application.php                                        |    2 +-
 gollem/manager.php                                                |    2 +-
 gollem/package.xml                                                |    2 +-
 gollem/permissions.php                                            |    2 +-
 gollem/quota.php                                                  |    2 +-
 gollem/selectlist.php                                             |    2 +-
 gollem/view.php                                                   |    2 +-
 hermes/admin.php                                                  |    2 +-
 hermes/deliverables.php                                           |    2 +-
 hermes/entry.php                                                  |    2 +-
 hermes/index.php                                                  |    2 +-
 hermes/invoicing.php                                              |    2 +-
 hermes/lib/Application.php                                        |    2 +-
 hermes/package.xml                                                |    2 +-
 hermes/scripts/purge.php                                          |    2 +-
 hermes/search.php                                                 |    2 +-
 hermes/start.php                                                  |    2 +-
 hermes/templates/index/index.inc                                  |    6 +-
 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                                      |    4 +-
 horde/admin/config/scripts.php                                    |    2 +-
 horde/admin/datatree.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-convert-datatree-groups-to-sql                    |    2 +-
 horde/bin/horde-convert-datatree-perms-to-sql                     |    2 +-
 horde/bin/horde-crond                                             |    2 +-
 horde/bin/horde-db-migrate                                        |    4 +-
 horde/bin/horde-import-squirrelmail-prefs                         |    2 +-
 horde/bin/horde-memcache-stats                                    |    2 +-
 horde/bin/horde-move-history-out-of-datatree                      |    2 +-
 horde/bin/horde-run-task                                          |    2 +-
 horde/bin/horde-set-perms                                         |    2 +-
 horde/bin/horde-themes                                            |    2 +-
 horde/bin/horde-translation                                       |    2 +-
 horde/config/conf.xml                                             |   16 +-
 horde/config/registry.php                                         |    2 +-
 horde/index.php                                                   |    2 +-
 horde/lib/Application.php                                         |    2 +-
 horde/lib/core.php                                                |    2 +-
 horde/login.php                                                   |    2 +-
 horde/package.xml                                                 |    2 +-
 horde/rampage.php                                                 |    2 +-
 horde/rpc.php                                                     |    2 +-
 horde/rpc/index.php                                               |    2 +-
 horde/scripts/upgrades/2008-08-29_fix_mdb2_sequences.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/imple.php                                          |    2 +-
 horde/services/keyboard.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/mobile.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/sidebar.php                                        |    2 +-
 horde/services/snooze.php                                         |    2 +-
 horde/services/twitter/index.php                                  |    2 +-
 horde/signup.php                                                  |    2 +-
 horde/templates/data/datemap.inc                                  |    2 +-
 horde/templates/portal/edit.inc                                   |    8 +-
 horde/templates/test/extensions.inc                               |    2 +-
 horde/templates/test/header.inc                                   |    2 +-
 horde/test.php                                                    |   12 +-
 horde/util/barcode.php                                            |    2 +-
 horde/util/icon_browser.php                                       |    2 +-
 hylax/compose.php                                                 |    2 +-
 hylax/folder.php                                                  |    2 +-
 hylax/img.php                                                     |    2 +-
 hylax/index.php                                                   |    2 +-
 hylax/lib/Application.php                                         |    2 +-
 hylax/lib/Driver.php                                              |    2 +-
 hylax/lib/Image.php                                               |    2 +-
 hylax/lib/Storage.php                                             |    2 +-
 hylax/print.php                                                   |    2 +-
 hylax/scripts/fax_create.php                                      |    2 +-
 hylax/scripts/fax_create_recv.php                                 |    2 +-
 hylax/scripts/fax_save_data.php                                   |    2 +-
 hylax/scripts/fax_save_recv_data.php                              |    2 +-
 hylax/scripts/install_cups_drivers.php                            |    2 +-
 hylax/send.php                                                    |    2 +-
 hylax/summary.php                                                 |    2 +-
 hylax/view.php                                                    |    2 +-
 imp/attachment.php                                                |    2 +-
 imp/bin/imp-bounce-spam                                           |    2 +-
 imp/bin/imp-mailbox-decode                                        |    2 +-
 imp/bin/imp-query-imap-cache                                      |    2 +-
 imp/compose-dimp.php                                              |    2 +-
 imp/compose-mimp.php                                              |    2 +-
 imp/compose.php                                                   |    2 +-
 imp/contacts.php                                                  |    2 +-
 imp/folders-mimp.php                                              |    2 +-
 imp/folders.php                                                   |    2 +-
 imp/index-dimp.php                                                |    2 +-
 imp/index.php                                                     |    2 +-
 imp/lib/Api.php                                                   |   10 +
 imp/lib/Application.php                                           |    2 +-
 imp/mailbox-mimp.php                                              |    2 +-
 imp/mailbox.php                                                   |    2 +-
 imp/message-dimp.php                                              |    2 +-
 imp/message-mimp.php                                              |    2 +-
 imp/message.php                                                   |    2 +-
 imp/mobile.php                                                    |    2 +-
 imp/pgp.php                                                       |    2 +-
 imp/rss.php                                                       |    2 +-
 imp/saveimage.php                                                 |    2 +-
 imp/search-basic.php                                              |    2 +-
 imp/search.php                                                    |    2 +-
 imp/smime.php                                                     |    2 +-
 imp/test/Imp/Autoload.php                                         |    2 +-
 imp/test/Imp/Unit/ComposeTest.php                                 |    2 +-
 imp/test/Imp/Unit/MboxParseTest.php                               |    8 +-
 imp/test/Imp/Unit/Mime/Viewer/HtmlTest.php                        |    4 +-
 imp/test/Imp/Unit/Mime/Viewer/ItipTest.php                        |    2 +-
 imp/test/Imp/Unit/QuotaTest.php                                   |    4 +-
 imp/thread.php                                                    |    2 +-
 imp/view.php                                                      |    2 +-
 ingo/bin/ingo-convert-datatree-shares-to-sql                      |    2 +-
 ingo/bin/ingo-convert-prefs-to-sql                                |    2 +-
 ingo/bin/ingo-convert-sql-shares-to-sqlng                         |    4 +-
 ingo/bin/ingo-postfix-policyd                                     |    2 +-
 ingo/blacklist.php                                                |    2 +-
 ingo/filters.php                                                  |    2 +-
 ingo/forward.php                                                  |    2 +-
 ingo/index.php                                                    |    2 +-
 ingo/lib/Application.php                                          |    2 +-
 ingo/lib/tests/AllTests.php                                       |    4 +-
 ingo/lib/tests/MaildropTest.php                                   |    2 +-
 ingo/lib/tests/ProcmailTest.php                                   |    2 +-
 ingo/lib/tests/ScriptTest.php                                     |    8 +-
 ingo/lib/tests/SieveTest.php                                      |    2 +-
 ingo/migration/4_ingo_upgrade_sqlhierarchical.php                 |    2 +-
 ingo/migration/5_ingo_upgrade_sqlnghierarchical.php               |    2 +-
 ingo/package.xml                                                  |    2 +-
 ingo/rule.php                                                     |    2 +-
 ingo/script.php                                                   |    2 +-
 ingo/spam.php                                                     |    2 +-
 ingo/vacation.php                                                 |    2 +-
 ingo/whitelist.php                                                |    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                                          |    4 +-
 jonah/delivery/rss.php                                            |    2 +-
 jonah/dispatcher.php                                              |    2 +-
 jonah/docs/INSTALL                                                |    2 +-
 jonah/feed.php                                                    |    2 +-
 jonah/index.php                                                   |    2 +-
 jonah/lib/Application.php                                         |    2 +-
 jonah/package.xml                                                 |    2 +-
 jonah/scripts/feed_tester.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/bin/klutz-fetch-comics                                      |    2 +-
 klutz/comics.php                                                  |    2 +-
 klutz/index.php                                                   |    4 +-
 klutz/lib/Application.php                                         |    2 +-
 klutz/lib/Block/Comics.php                                        |    2 +-
 klutz/savecomic.php                                               |    2 +-
 kolab/index.php                                                   |    2 +-
 kolab/lib/Application.php                                         |    2 +-
 kolab/package.xml                                                 |    2 +-
 kolab/test/Kolab/ExampleTest.php                                  |    2 +-
 koward/lib/Koward.php                                             |    4 +-
 koward/lib/Koward/Test.php                                        |    4 +-
 koward/lib/Koward/Test/AllTests.php                               |    2 +-
 koward/lib/Koward/Test/Renderer.php                               |    2 +-
 koward/test/Koward/AllTests.php                                   |    2 +-
 koward/test/Koward/TestInit.php                                   |    2 +-
 koward/www/horde/config/registry.php.dist                         |   10 +-
 koward/www/htdocs/koward/koward.php                               |    2 +-
 koward/www/koward/config/base.php.dist                            |    2 +-
 koward/www/koward/config/objects.php.dist                         |    4 +-
 koward/www/koward/config/routes.php.dist                          |    4 +-
 koward/www/koward/config/search.php.dist                          |    4 +-
 kronolith/add.php                                                 |    2 +-
 kronolith/attend.php                                              |    2 +-
 kronolith/attendees.php                                           |    2 +-
 kronolith/bin/kronolith-agenda                                    |    4 +-
 kronolith/bin/kronolith-convert-datatree-shares-to-sql            |    4 +-
 kronolith/bin/kronolith-convert-sql-shares-to-sqlng               |    4 +-
 kronolith/bin/kronolith-convert-to-utc                            |    5 +-
 kronolith/bin/kronolith-import-icals                              |    4 +-
 kronolith/bin/kronolith-import-squirrelmail-calendar              |    4 +-
 kronolith/calendars/create.php                                    |    2 +-
 kronolith/calendars/delete.php                                    |    2 +-
 kronolith/calendars/edit.php                                      |    2 +-
 kronolith/calendars/index.php                                     |    2 +-
 kronolith/calendars/info.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/lib/Application.php                                     |    2 +-
 kronolith/lib/Kronolith.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/mobile.php                                              |    2 +-
 kronolith/month.php                                               |    2 +-
 kronolith/new.php                                                 |    2 +-
 kronolith/package.xml                                             |    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/resources/groups/index.php                              |    2 +-
 kronolith/resources/index.php                                     |    2 +-
 kronolith/search.php                                              |    2 +-
 kronolith/templates/chunks/calendar.php                           |    4 +-
 kronolith/templates/index/index.inc                               |   18 +-
 kronolith/test/Kronolith/Autoload.php                             |   22 +-
 kronolith/test/Kronolith/Integration/AllDayTest.php               |    4 +-
 kronolith/test/Kronolith/Integration/Driver/KolabTest.php         |    2 +-
 .../test/Kronolith/Integration/Driver/Sql/Pdo/SqliteTest.php      |    4 +-
 kronolith/test/Kronolith/Integration/FromIcalendarTest.php        |    4 +-
 kronolith/test/Kronolith/Integration/Kronolith/KolabTest.php      |    2 +-
 .../test/Kronolith/Integration/Kronolith/Sql/Pdo/SqliteTest.php   |    4 +-
 kronolith/test/Kronolith/Integration/ToIcalendarTest.php          |    4 +-
 kronolith/view.php                                                |    2 +-
 kronolith/week.php                                                |    2 +-
 kronolith/workweek.php                                            |    2 +-
 kronolith/year.php                                                |    2 +-
 luxor/bin/luxor-indexer                                           |    2 +-
 luxor/config/backends.php                                         |    2 +-
 luxor/index.php                                                   |    2 +-
 luxor/lib/Application.php                                         |    2 +-
 luxor/search.php                                                  |    2 +-
 luxor/source.php                                                  |    2 +-
 luxor/symbol.php                                                  |    2 +-
 mnemo/bin/mnemo-convert-datatree-shares-to-sql                    |    4 +-
 mnemo/bin/mnemo-convert-sql-shares-to-sqlng                       |    4 +-
 mnemo/bin/mnemo-convert-to-utf8                                   |    4 +-
 mnemo/bin/mnemo-import-text-note                                  |    4 +-
 mnemo/data.php                                                    |    2 +-
 mnemo/index.php                                                   |    2 +-
 mnemo/lib/Application.php                                         |    2 +-
 mnemo/list.php                                                    |    2 +-
 mnemo/memo.php                                                    |    2 +-
 mnemo/migration/4_mnemo_upgrade_sqlhierarchical.php               |    2 +-
 mnemo/migration/5_mnemo_upgrade_sqlnghierarchical.php             |    2 +-
 mnemo/note/pdf.php                                                |    2 +-
 mnemo/notepads/create.php                                         |    2 +-
 mnemo/notepads/delete.php                                         |    2 +-
 mnemo/notepads/edit.php                                           |    2 +-
 mnemo/notepads/index.php                                          |    2 +-
 mnemo/notes/index.php                                             |    2 +-
 mnemo/package.xml                                                 |    2 +-
 mnemo/search.php                                                  |    2 +-
 mnemo/test/Mnemo/Autoload.php                                     |    8 +-
 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/KolabTest.php                         |    2 +-
 mnemo/test/Mnemo/Unit/Mnemo/Sql/Pdo/SqliteTest.php                |    2 +-
 mnemo/view.php                                                    |    2 +-
 nag/bin/nag-convert-datatree-shares-to-sql                        |    2 +-
 nag/bin/nag-convert-sql-shares-to-sqlng                           |    4 +-
 nag/bin/nag-create-missing-add-histories-sql                      |    4 +-
 nag/bin/nag-import-vtodos                                         |    2 +-
 nag/data.php                                                      |    2 +-
 nag/index.php                                                     |    6 +-
 nag/lib/Application.php                                           |    2 +-
 nag/list.php                                                      |    2 +-
 nag/migration/7_nag_upgrade_sqlhierarchical.php                   |    2 +-
 nag/migration/8_nag_upgrade_sqlnghierarchical.php                 |    2 +-
 nag/mobile-create.php                                             |    2 +-
 nag/mobile-view.php                                               |    2 +-
 nag/mobile.php                                                    |    2 +-
 nag/package.xml                                                   |    2 +-
 nag/quick.php                                                     |    2 +-
 nag/search.php                                                    |    2 +-
 nag/task.php                                                      |    2 +-
 nag/tasklists/create.php                                          |    2 +-
 nag/tasklists/delete.php                                          |    2 +-
 nag/tasklists/edit.php                                            |    2 +-
 nag/tasklists/index.php                                           |    2 +-
 nag/tasklists/info.php                                            |    2 +-
 nag/tasks/index.php                                               |    2 +-
 nag/test/Nag/Autoload.php                                         |   16 +-
 nag/test/Nag/TestCase.php                                         |    2 +-
 nag/test/Nag/Unit/Driver/KolabTest.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/KolabTest.php                         |    2 +-
 nag/test/Nag/Unit/Form/Task/Sql/Pdo/SqliteTest.php                |    2 +-
 nag/test/Nag/Unit/Nag/KolabTest.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/lib/Application.php                                      |    2 +-
 operator/lib/Driver.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/test/Passwd/Autoload.php                                   |    4 +-
 passwd/test/Passwd/TestCase.php                                   |    2 +-
 passwd/test/Passwd/Unit/Driver/SqlTest.php                        |    2 +-
 passwd/test/Passwd/Unit/Factory/DriverTest.php                    |    2 +-
 pastie/index.php                                                  |    2 +-
 pastie/lib/Application.php                                        |    2 +-
 pastie/paste.php                                                  |    2 +-
 pastie/view.php                                                   |    2 +-
 sam/blacklist.php                                                 |    2 +-
 sam/index.php                                                     |    2 +-
 sam/lib/Application.php                                           |    2 +-
 sam/package.xml                                                   |    2 +-
 sam/spam.php                                                      |    2 +-
 sam/whitelist.php                                                 |    2 +-
 sesha/admin.php                                                   |    2 +-
 sesha/index.php                                                   |    2 +-
 sesha/lib/Api.php                                                 |  145 +-
 sesha/lib/Application.php                                         |    2 +-
 sesha/list.php                                                    |    2 +-
 sesha/package.xml                                                 |    2 +-
 sesha/search.php                                                  |    2 +-
 sesha/stock.php                                                   |    2 +-
 sesha/test/Sesha/Autoload.php                                     |    4 +-
 sesha/test/Sesha/TestCase.php                                     |    4 +-
 sesha/test/Sesha/Unit/Driver/SqlTest.php                          |    2 +-
 shout/admin.php                                                   |    2 +-
 shout/admin/accounts.php                                          |    2 +-
 shout/admin/numbers.php                                           |    2 +-
 shout/conferences.php                                             |    2 +-
 shout/devices.php                                                 |    2 +-
 shout/dialplan.php                                                |    2 +-
 shout/extensions.php                                              |    2 +-
 shout/index.php                                                   |    2 +-
 shout/lib/Application.php                                         |    2 +-
 shout/lib/Driver.php                                              |    2 +-
 shout/recordings.php                                              |    2 +-
 shout/wizard.php                                                  |    2 +-
 skeleton/index.php                                                |    2 +-
 skeleton/lib/Application.php                                      |    2 +-
 skeleton/list.php                                                 |    2 +-
 skeleton/test/Skeleton/ExampleTest.php                            |    2 +-
 timeobjects/lib/Application.php                                   |    2 +-
 timeobjects/package.xml                                           |    2 +-
 trean/add.php                                                     |    3 +-
 trean/bin/trean-url-checker                                       |    7 +-
 trean/browse.php                                                  |    3 +-
 trean/edit.php                                                    |    3 +-
 trean/favicon.php                                                 |    2 +-
 trean/index.php                                                   |    2 +-
 trean/lib/Application.php                                         |    2 +-
 trean/lib/Block/Bookmarks.php                                     |    2 +-
 trean/lib/Block/Mostclicked.php                                   |    2 +-
 trean/package.xml                                                 |    2 +-
 trean/redirect.php                                                |    2 +-
 trean/rss.php                                                     |    2 +-
 trean/search.php                                                  |    3 +-
 trean/tagbrowse.php                                               |    2 +-
 turba/add.php                                                     |    2 +-
 turba/addressbooks/create.php                                     |    2 +-
 turba/addressbooks/delete.php                                     |    2 +-
 turba/addressbooks/edit.php                                       |    2 +-
 turba/addressbooks/index.php                                      |    2 +-
 turba/bin/turba-convert-datatree-shares-to-sql                    |    4 +-
 turba/bin/turba-convert-sql-shares-to-sqlng                       |    4 +-
 turba/bin/turba-import-squirrelmail-file-abook                    |    4 +-
 turba/bin/turba-import-squirrelmail-sql-abook                     |    4 +-
 turba/bin/turba-import-vcards                                     |    4 +-
 turba/bin/turba-public-to-horde-share                             |    4 +-
 turba/browse.php                                                  |    2 +-
 turba/config/backends.php                                         |    8 +-
 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/lib/Api.php                                                 |    2 +-
 turba/lib/Application.php                                         |    2 +-
 turba/merge.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/minisearch.php                                              |    2 +-
 turba/package.xml                                                 |    2 +-
 turba/search.php                                                  |    2 +-
 turba/test/Turba/Autoload.php                                     |    2 +-
 turba/test/Turba/TestCase.php                                     |    4 +-
 turba/test/Turba/ToDo/ApiTest.php                                 |    2 +-
 turba/test/Turba/ToDo/BrowsePageTest.php                          |    2 +-
 turba/test/Turba/ToDo/DriverTest.php                              |    2 +-
 turba/test/Turba/ToDo/GroupTest.php                               |    2 +-
 turba/test/Turba/ToDo/KolabTest.php                               |    2 +-
 turba/test/Turba/ToDo/KolabTestBase.php                           |    2 +-
 turba/test/Turba/ToDo/ListTest.php                                |    2 +-
 turba/test/Turba/ToDo/ListViewTest.php                            |    4 +-
 turba/test/Turba/ToDo/TestBase.php                                |    4 +-
 turba/test/Turba/ToDo/ViewBrowseTest.php                          |    2 +-
 turba/test/Turba/ToDo/ViewListTest.php                            |    4 +-
 turba/test/Turba/ToDo/bug_6518.phpt                               |    2 +-
 turba/test/Turba/ToDo/ldif_exportFile.phpt                        |    2 +-
 turba/test/Turba/ToDo/ldif_importFile.phpt                        |    4 +-
 turba/test/Turba/ToDo/ldif_importFileCRLF.phpt                    |    4 +-
 turba/test/Turba/ToDo/tohash.phpt                                 |    8 +-
 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/DriverTest.php                              |    4 +-
 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/Application.php                                       |    2 +-
 ulaform/package.xml                                               |    2 +-
 ulaform/sortfields.php                                            |    2 +-
 vilma/domains/delete.php                                          |    2 +-
 vilma/domains/edit.php                                            |    2 +-
 vilma/domains/index.php                                           |    2 +-
 vilma/index.php                                                   |    2 +-
 vilma/lib/Application.php                                         |    2 +-
 vilma/lib/tests/driver.phpt                                       |    2 +-
 vilma/scripts/create_mailboxes.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/admin/index.php                                             |    2 +-
 whups/bin/whups-bugzilla-import                                   |    4 +-
 whups/bin/whups-convert-datatree-shares-to-sql                    |    4 +-
 whups/bin/whups-convert-sql-shares-to-sqlng                       |    6 +-
 whups/bin/whups-convert-to-utf8                                   |    4 +-
 whups/bin/whups-git-hook                                          |    2 +-
 whups/bin/whups-mail-filter                                       |    4 +-
 whups/bin/whups-obliterate                                        |    4 +-
 whups/bin/whups-reminders                                         |    4 +-
 whups/bin/whups-svn-hook                                          |    2 +-
 whups/data.php                                                    |    2 +-
 whups/index.php                                                   |    2 +-
 whups/lib/Application.php                                         |    2 +-
 whups/lib/tests/ApiTest.php                                       |    2 +-
 whups/lib/tests/TestBase.php                                      |    2 +-
 whups/migration/4_whups_upgrade_sqlhierarchical.php               |    2 +-
 whups/migration/5_whups_upgrade_sqlnghierarchical.php             |    2 +-
 whups/mybugs.php                                                  |    2 +-
 whups/mybugs_edit.php                                             |    2 +-
 whups/opensearch.php                                              |    2 +-
 whups/package.xml                                                 |    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                                                 |    2 +-
 wicked/bin/wicked-convert-to-utf8                                 |    2 +-
 wicked/bin/wicked-mail-filter                                     |    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/Page.php                                               |    2 +-
 wicked/lib/Text_Wiki/Render/Xhtml/Freelink2.php                   |    2 +-
 wicked/opensearch.php                                             |    2 +-
 wicked/package.xml                                                |    2 +-
 wicked/preview.php                                                |    2 +-
 wicked/test/Wicked/Autoload.php                                   |    6 +-
 wicked/test/Wicked/Unit/Driver/SqlTest.php                        |    4 +-
 wicked/test/Wicked/Unit/RstTest.php                               |    4 +-
 wicked/test/Wicked/fixtures/cli_modular.rst                       |    2 +-
 wicked/test/Wicked/fixtures/cli_modular.wiki                      |    2 +-
 wicked/view.php                                                   |    2 +-
 1473 files changed, 7596 insertions(+), 5527 deletions(-)

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

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

commit 50fee9eb163810ebafe049301b88f953fa3c533d
Merge: eaa7020 485ffdd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 19 15:30:39 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	kronolith/package.xml
    	kronolith/templates/index/index.inc

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

http://git.horde.org/horde-git/-/commit/50fee9eb163810ebafe049301b88f953fa3c533d




More information about the commits mailing list