[commits] Horde branch master updated. a5932cf5d21e9990417af25cc9887f6c66e40dfe

[Michael J. Rubinsky]

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

from: 097598615e6c18202b9252e0c97fe2b6665ebb22

a5932cf BFN

Summary: http://github.com/horde/horde/compare/097598615e6c18202b9252e0c97fe2b6665ebb22...a5932cf5d21e9990417af25cc9887f6c66e40dfe

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

commit a5932cf5d21e9990417af25cc9887f6c66e40dfe
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jul 20 18:26:43 2014 -0400

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

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

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