[commits] Horde branch FRAMEWORK_5_1 updated. 3ee0843029d8f447677cedc0e57871821479cdfa

[Michael J. Rubinsky]

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

from: 5706e61d5e11bb4b69c19825d3e659ac5e48e747

b3f00ee Bug: 12890  Fix unencrypting and saving a previously encrypted note.
3ee0843 BFN

Summary: http://github.com/horde/horde/compare/5706e61d5e11bb4b69c19825d3e659ac5e48e747...3ee0843029d8f447677cedc0e57871821479cdfa

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

commit b3f00ee87ea7c9fc2a4ba0b315d94c1ee5670565
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jan 27 14:22:29 2014 -0500

    Bug: 12890  Fix unencrypting and saving a previously encrypted note.
    
    Conflicts:
    	mnemo/memo.php

 mnemo/memo.php |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

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

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

commit 3ee0843029d8f447677cedc0e57871821479cdfa
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Feb 10 12:03:24 2014 -0500

    BFN

 mnemo/docs/CHANGES |    1 +
 mnemo/package.xml  |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

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