[commits] Horde branch master updated. e2805177bc73a2264dbd6df121ca8c8ab17679f4

[Michael J. Rubinsky]

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

from: 88ab97c1674b4392a970eb0ed70759c70d817750

e280517 BFN

Summary: http://github.com/horde/horde/compare/88ab97c1674b4392a970eb0ed70759c70d817750...e2805177bc73a2264dbd6df121ca8c8ab17679f4

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

commit e2805177bc73a2264dbd6df121ca8c8ab17679f4
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 21 09:35:58 2014 -0400

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

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

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