[commits] Horde branch master updated. c88df5eba1a62bc8a932428a00a8b3a5fd3d921f

[Michael J. Rubinsky]

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

from: e3c6d57fb64bba712e60b964462e6786cbe67c67

c88df5e BFN

Summary: http://github.com/horde/horde/compare/e3c6d57fb64bba712e60b964462e6786cbe67c67...c88df5eba1a62bc8a932428a00a8b3a5fd3d921f

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

commit c88df5eba1a62bc8a932428a00a8b3a5fd3d921f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 9 14:01:47 2014 -0500

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

 horde/docs/CHANGES |    8 ++++++++
 horde/package.xml  |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

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