[commits] Horde branch master updated. de02ee256a1ca5b31ee21d5449f40390e2612db3

[Michael J. Rubinsky]

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

from: 6dd551000fbbf91a8969bcb1c8800a74d04a3745

de02ee2 BFN

Summary: http://github.com/horde/horde/compare/6dd551000fbbf91a8969bcb1c8800a74d04a3745...de02ee256a1ca5b31ee21d5449f40390e2612db3

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

commit de02ee256a1ca5b31ee21d5449f40390e2612db3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Aug 30 22:15:08 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/de02ee256a1ca5b31ee21d5449f40390e2612db3