[commits] Horde branch master updated. e0578d2e5c412e85dd7924bee887f7b28c68c492

[Michael J. Rubinsky]

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

from: f80ed69a626383450c0db52c9feb46f0eb29e64c

e0578d2 BFN

Summary: http://github.com/horde/horde/compare/f80ed69a626383450c0db52c9feb46f0eb29e64c...e0578d2e5c412e85dd7924bee887f7b28c68c492

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

commit e0578d2e5c412e85dd7924bee887f7b28c68c492
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Jan 7 22:16:04 2015 -0500

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

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

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