[commits] Horde branch master updated. 11faee5022321606101c0b1d016eaa360e90a2c0

[Michael J. Rubinsky]

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

from: 4829abd1d3b11a426033251a0657abf08ae9a539

11faee5 BFN

Summary: http://github.com/horde/horde/compare/4829abd1d3b11a426033251a0657abf08ae9a539...11faee5022321606101c0b1d016eaa360e90a2c0

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

commit 11faee5022321606101c0b1d016eaa360e90a2c0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 12 17:33:56 2014 -0400

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

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

http://github.com/horde/horde/commit/11faee5022321606101c0b1d016eaa360e90a2c0