[commits] Horde branch master updated. e014d1e1fb70725a537dba6178774aeafab8ddbe

[Michael J. Rubinsky]

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

from: 30a35ee4fe46e9cc8a85f193a9bbf2569666ae9d

e014d1e BFN

Summary: http://github.com/horde/horde/compare/30a35ee4fe46e9cc8a85f193a9bbf2569666ae9d...e014d1e1fb70725a537dba6178774aeafab8ddbe

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

commit e014d1e1fb70725a537dba6178774aeafab8ddbe
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 24 16:16:39 2014 -0400

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

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

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