[commits] Horde branch FRAMEWORK_5_2 updated. 5ab0db0259c7528ba7e915885ada66e1f1128502

[Michael J. Rubinsky]

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

from: f63ffac9c5d2d27a151f6b3172e754ff55b8ca4e

5ab0db0 Use the same template to render the preference version of EAS info.

Summary: http://github.com/horde/horde/compare/f63ffac9c5d2d27a151f6b3172e754ff55b8ca4e...5ab0db0259c7528ba7e915885ada66e1f1128502

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

commit 5ab0db0259c7528ba7e915885ada66e1f1128502
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Sep 17 13:09:12 2014 -0400

    Use the same template to render the preference version of EAS info.
    
    Bug: 13578
    
    Conflicts:
    	horde/templates/prefs/activesync.html.php

 horde/lib/Prefs/Special/Activesync.php    |   13 +++++++++-
 horde/templates/prefs/activesync.html.php |   39 ++--------------------------
 2 files changed, 15 insertions(+), 37 deletions(-)

http://github.com/horde/horde/commit/5ab0db0259c7528ba7e915885ada66e1f1128502