[commits] Horde branch master updated. 88aed42cbd262bd1715915ff51821db1db4013d5

[Michael J. Rubinsky]

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

from: 16e3c86c473ff8da4c0e3fbe9f7470b7db72f7f7

88aed42 BFN

Summary: http://github.com/horde/horde/compare/16e3c86c473ff8da4c0e3fbe9f7470b7db72f7f7...88aed42cbd262bd1715915ff51821db1db4013d5

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

commit 88aed42cbd262bd1715915ff51821db1db4013d5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jul 28 13:47:54 2014 -0400

    BFN
    
    Conflicts:
    	nag/package.xml

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

http://github.com/horde/horde/commit/88aed42cbd262bd1715915ff51821db1db4013d5