[commits] Horde branch master updated. 2a084b367086516ad5b0cae404ecb440460921d2

[Michael J. Rubinsky]

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

from: 4e70bbc2fcff325d44f54932fc9d378e4d2c35ef

2a084b3 BFN

Summary: http://github.com/horde/horde/compare/4e70bbc2fcff325d44f54932fc9d378e4d2c35ef...2a084b367086516ad5b0cae404ecb440460921d2

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

commit 2a084b367086516ad5b0cae404ecb440460921d2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jul 20 15:08:16 2014 -0400

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

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

http://github.com/horde/horde/commit/2a084b367086516ad5b0cae404ecb440460921d2