[commits] Horde branch master updated. e7ef7912e995db4570b5e6509f46d87e8635b96a

[Jan Schneider]

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

from: fad71fa545fd0a3e5393cec51af7115f045b40f8

f87280a Released Horde_Alarm-2.2.2
fdd6854 Development mode for Horde_Alarm-2.2.3
036b25f Released Horde_Db-2.1.5
6098bfc Development mode for Horde_Db-2.1.6
7534869 No need for 'adapter'.
37ca0cb Update expected exception.
921afa7 More exception fixes.
e7ef791 Merge branch 'master' of ssh://dev.horde.org/horde/git/horde

Summary: http://github.com/horde/horde/compare/fad71fa545fd0a3e5393cec51af7115f045b40f8...e7ef7912e995db4570b5e6509f46d87e8635b96a

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

commit f87280a85aca61c47a76af82f15cc7b990cc8f27
Author: Jan Schneider <jan at horde.org>
Date:   Thu Oct 23 13:16:22 2014 +0200

    Released Horde_Alarm-2.2.2

 framework/Alarm/composer.json |    4 ++--
 framework/Alarm/package.xml   |   16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

http://github.com/horde/horde/commit/f87280a85aca61c47a76af82f15cc7b990cc8f27

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

commit fdd6854dbff9f3826cef28f42b7e6a6594bc7d71
Author: Jan Schneider <jan at horde.org>
Date:   Thu Oct 23 13:16:23 2014 +0200

    Development mode for Horde_Alarm-2.2.3

 framework/Alarm/package.xml |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/fdd6854dbff9f3826cef28f42b7e6a6594bc7d71

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

commit 036b25f0a7975f5c620991b04cb1bdf2ee0b00ed
Author: Jan Schneider <jan at horde.org>
Date:   Thu Oct 23 14:02:00 2014 +0200

    Released Horde_Db-2.1.5

 framework/Db/composer.json |    4 ++--
 framework/Db/package.xml   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/036b25f0a7975f5c620991b04cb1bdf2ee0b00ed

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

commit 6098bfc2b3ec243f3c3b2bca646da3c92a359f6b
Author: Jan Schneider <jan at horde.org>
Date:   Thu Oct 23 14:02:01 2014 +0200

    Development mode for Horde_Db-2.1.6

 framework/Db/package.xml |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/6098bfc2b3ec243f3c3b2bca646da3c92a359f6b

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

commit 7534869387625762f4b1efb7d44436c25bc4a630
Author: Jan Schneider <jan at horde.org>
Date:   Thu Oct 23 14:16:25 2014 +0200

    No need for 'adapter'.

 framework/History/test/Horde/History/conf.php.dist |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

http://github.com/horde/horde/commit/7534869387625762f4b1efb7d44436c25bc4a630

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

commit 37ca0cba33303f0bfc8a9bb4cd1a6f0795c524be
Author: Jan Schneider <jan at horde.org>
Date:   Fri Oct 24 13:03:49 2014 +0200

    Update expected exception.

 framework/History/test/Horde/History/TestBase.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

http://github.com/horde/horde/commit/37ca0cba33303f0bfc8a9bb4cd1a6f0795c524be

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

commit 921afa7ffd4fff32fc1b8c26cc67bafdd236dd1f
Author: Jan Schneider <jan at horde.org>
Date:   Fri Oct 24 13:45:14 2014 +0200

    More exception fixes.

 framework/History/lib/Horde/History.php       |   18 +++++++++---------
 framework/History/lib/Horde/History/Mock.php  |    6 +++---
 framework/History/lib/Horde/History/Mongo.php |    2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

http://github.com/horde/horde/commit/921afa7ffd4fff32fc1b8c26cc67bafdd236dd1f

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

commit e7ef7912e995db4570b5e6509f46d87e8635b96a
Merge: 921afa7 fad71fa
Author: Jan Schneider <jan at horde.org>
Date:   Sat Oct 25 15:32:57 2014 +0200

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

 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |    6 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php        |   26 ++-
 framework/ActiveSync/lib/Horde/ActiveSync/Mime.php                |   41 ++-
 framework/ActiveSync/package.xml                                  |   12 +-
 framework/ActiveSync/test/Horde/ActiveSync/MimeTest.php           |   15 +
 framework/ActiveSync/test/Horde/ActiveSync/fixtures/encrypted.eml |   63 ++++
 imp/js/imp.js                                                     |   65 +++--
 imp/lib/Mime/Viewer/Html.php                                      |    2 +-
 8 files changed, 190 insertions(+), 40 deletions(-)

http://github.com/horde/horde/commit/e7ef7912e995db4570b5e6509f46d87e8635b96a