[commits] Horde branch FRAMEWORK_5_2 updated. f9ded0aab009fc18ab3a03c151e8828a613fc887

[Michael J. Rubinsky]

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

from: ba81f76ab7a69328df762067a47092e5b2bfeda4

6b54414 Bug: 13657  Fix user activesync client actions.
f9ded0a BFN

Summary: http://github.com/horde/horde/compare/ba81f76ab7a69328df762067a47092e5b2bfeda4...f9ded0aab009fc18ab3a03c151e8828a613fc887

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

commit 6b54414787e96f6028bf36eb5d40d2d941fa640c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 9 13:57:51 2014 -0500

    Bug: 13657  Fix user activesync client actions.
    
    Conflicts:
    	horde/lib/Prefs/Special/Activesync.php

 horde/lib/Prefs/Special/Activesync.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/6b54414787e96f6028bf36eb5d40d2d941fa640c

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

commit f9ded0aab009fc18ab3a03c151e8828a613fc887
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 9 14:01:47 2014 -0500

    BFN

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

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