[commits] Horde branch master updated. f1aab2e7844e1cf33b3d42eab36bf05ca1093e24

[Michael J. Rubinsky]

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

from: f8c3d2da1fd98f07fb9007d7e1ab5cfb89e92dcb

f1aab2e BFN

Summary: http://github.com/horde/horde/compare/f8c3d2da1fd98f07fb9007d7e1ab5cfb89e92dcb...f1aab2e7844e1cf33b3d42eab36bf05ca1093e24

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

commit f1aab2e7844e1cf33b3d42eab36bf05ca1093e24
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Aug 29 23:47:40 2014 -0400

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

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

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