[commits] Horde branch FRAMEWORK_5_2 updated. 5af4452df7cd3076fa514201bee44f3f0713eb3c

[Michael J. Rubinsky]

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

from: d4c314bac8ece1ed6846cc00a77bece93a2178ad

de5eff0 Bug: 13660  Don't show private events in daily agenda email.
5af4452 BFN

Summary: http://github.com/horde/horde/compare/d4c314bac8ece1ed6846cc00a77bece93a2178ad...5af4452df7cd3076fa514201bee44f3f0713eb3c

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

commit de5eff0536b013bb5d9400cf0f3b914ecc00ec59
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Nov 3 15:43:57 2014 -0500

    Bug: 13660  Don't show private events in daily agenda email.
    
    Conflicts:
    	kronolith/lib/Kronolith.php

 kronolith/bin/kronolith-agenda     |    5 ++++-
 kronolith/lib/CalendarsManager.php |   19 +++++++++++++++----
 kronolith/lib/Event.php            |   21 +++++++++++++--------
 kronolith/lib/Kronolith.php        |   19 +++++++++++++------
 4 files changed, 45 insertions(+), 19 deletions(-)

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

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

commit 5af4452df7cd3076fa514201bee44f3f0713eb3c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Nov 3 16:48:52 2014 -0500

    BFN

 kronolith/docs/CHANGES |    2 ++
 kronolith/package.xml  |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

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