[commits] Horde branch master updated. 7177939b7a58573fca65aa9715ed42d2ae3798c7

[Michael M Slusarz]

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

from: abe0d77b36d941af3f763a20b3fe8f290014c67d

3abeecd Actually merge original params
7177939 the old json_decode() quirk strikes again

Summary: http://github.com/horde/horde/compare/abe0d77b36d941af3f763a20b3fe8f290014c67d...7177939b7a58573fca65aa9715ed42d2ae3798c7

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

commit 3abeecd093721d137bfe44202bbad68664170886
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 5 23:21:03 2014 -0700

    Actually merge original params

 .../Imap_Client/lib/Horde/Imap/Client/Cache/Backend/Hashtable.php |    6 +---
 1 files changed, 2 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/3abeecd093721d137bfe44202bbad68664170886
http://git.horde.org/horde-git/-/commit/3abeecd093721d137bfe44202bbad68664170886

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

commit 7177939b7a58573fca65aa9715ed42d2ae3798c7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 5 23:21:31 2014 -0700

    the old json_decode() quirk strikes again

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

http://github.com/horde/horde/commit/7177939b7a58573fca65aa9715ed42d2ae3798c7
http://git.horde.org/horde-git/-/commit/7177939b7a58573fca65aa9715ed42d2ae3798c7