[commits] Horde branch master updated. 3e7bd502e41d03b8cad8cc7c3adeee1cd5eb07ab

[Michael J. Rubinsky]

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

from: 0bd82ef296ede0054b33f8edf3e02ac69d3cad16

3e7bd50 BFN

Summary: http://github.com/horde/horde/compare/0bd82ef296ede0054b33f8edf3e02ac69d3cad16...3e7bd502e41d03b8cad8cc7c3adeee1cd5eb07ab

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

commit 3e7bd502e41d03b8cad8cc7c3adeee1cd5eb07ab
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 28 21:42:25 2014 -0400

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

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

http://github.com/horde/horde/commit/3e7bd502e41d03b8cad8cc7c3adeee1cd5eb07ab