[commits] Horde branch master updated. 847f8e67ef9982f115f72220bd621bf10d240578

[Michael J. Rubinsky]

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

from: ccbd210f83d049ec71d8b83f893ba3ab8bed39ce

847f8e6 BFN

Summary: http://github.com/horde/horde/compare/ccbd210f83d049ec71d8b83f893ba3ab8bed39ce...847f8e67ef9982f115f72220bd621bf10d240578

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

commit 847f8e67ef9982f115f72220bd621bf10d240578
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Aug 29 12:47:58 2014 -0400

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

 kronolith/docs/CHANGES |   11 +++++++++++
 kronolith/package.xml  |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/847f8e67ef9982f115f72220bd621bf10d240578