[commits] Horde branch FRAMEWORK_5_2 updated. 04d28f8cb4bf0fb85c68022e49c567fc98289ef4

[Michael J. Rubinsky]

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

from: eadafd8a5e18d8b1d2c0d68df782eef7866e5ccb

04d28f8 Revert "Simplify."

Summary: http://github.com/horde/horde/compare/eadafd8a5e18d8b1d2c0d68df782eef7866e5ccb...04d28f8cb4bf0fb85c68022e49c567fc98289ef4

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

commit 04d28f8cb4bf0fb85c68022e49c567fc98289ef4
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Jul 9 17:00:42 2014 -0400

    Revert "Simplify."
    
    This reverts commit 0eb2ee2b20a0cf621603766077afd3924bb670b5.
    
    Not sure why all these commits were merged to FW_5_2. The commits
    that were meant for 5_2 were already merged. This one relies on
    a commit that is only in master.

 trean/lib/Bookmarks.php |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/04d28f8cb4bf0fb85c68022e49c567fc98289ef4