[commits] Horde branch master updated. cf57886acda3d58fd74e99f7b0daf16f172e074a

[Jan Schneider]

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

from: e23fddea0c6a935274a94b4e92fef60935a50117

cf57886 BFN

Summary: http://github.com/horde/horde/compare/e23fddea0c6a935274a94b4e92fef60935a50117...cf57886acda3d58fd74e99f7b0daf16f172e074a

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

commit cf57886acda3d58fd74e99f7b0daf16f172e074a
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jul 31 15:10:59 2014 +0200

    BFN
    
    Conflicts:
    	kronolith/docs/CHANGES
    	kronolith/package.xml
    	nag/package.xml
    	turba/docs/CHANGES
    	turba/package.xml

 kronolith/docs/CHANGES |    1 +
 kronolith/package.xml  |    1 +
 nag/docs/CHANGES       |    3 +++
 nag/package.xml        |    2 ++
 turba/docs/CHANGES     |    2 ++
 turba/package.xml      |    2 ++
 6 files changed, 11 insertions(+), 0 deletions(-)

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