[commits] Horde branch master updated. 6157750a574628b8f6c2d2bea208fbfe0cc6d2c7

[Michael J. Rubinsky]

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

from: ef9bfe1e9ffca975835d4226e4769372db96254b

6157750 BFN

Summary: http://github.com/horde/horde/compare/ef9bfe1e9ffca975835d4226e4769372db96254b...6157750a574628b8f6c2d2bea208fbfe0cc6d2c7

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

commit 6157750a574628b8f6c2d2bea208fbfe0cc6d2c7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 28 16:06:02 2014 -0400

    BFN
    
    Conflicts:
    	kronolith/docs/CHANGES
    	kronolith/package.xml
    	mnemo/package.xml

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

http://github.com/horde/horde/commit/6157750a574628b8f6c2d2bea208fbfe0cc6d2c7