[commits] Horde branch master updated. 4e4d91425f26e945db01b7301ad0ebfb17c5db4b

[Michael J. Rubinsky]

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

from: 6797ab56d8e382fc0a26f37a436a3c2b893b16db

4e4d914 BFN

Summary: http://github.com/horde/horde/compare/6797ab56d8e382fc0a26f37a436a3c2b893b16db...4e4d91425f26e945db01b7301ad0ebfb17c5db4b

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

commit 4e4d91425f26e945db01b7301ad0ebfb17c5db4b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Jul 29 12:50:30 2014 -0400

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

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

http://github.com/horde/horde/commit/4e4d91425f26e945db01b7301ad0ebfb17c5db4b