[commits] Horde branch master updated. 61c33a68ae813b162d3849fd79063f7379ae9c0f

[Michael J. Rubinsky]

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

from: 8f685d68c0fe1602f9b9192345a992e9abefcb89

61c33a6 BFN

Summary: http://github.com/horde/horde/compare/8f685d68c0fe1602f9b9192345a992e9abefcb89...61c33a68ae813b162d3849fd79063f7379ae9c0f

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

commit 61c33a68ae813b162d3849fd79063f7379ae9c0f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jul 20 14:13:59 2014 -0400

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

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

http://github.com/horde/horde/commit/61c33a68ae813b162d3849fd79063f7379ae9c0f