[commits] Horde branch master updated. 250b17517707596d73202a0942ba42a5c4628d7d

[Michael J. Rubinsky]

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

from: 24f37c1476e75ff2605b16907ba1f1b5ae7df950

250b175 BFN

Summary: http://github.com/horde/horde/compare/24f37c1476e75ff2605b16907ba1f1b5ae7df950...250b17517707596d73202a0942ba42a5c4628d7d

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

commit 250b17517707596d73202a0942ba42a5c4628d7d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Oct 20 22:41:54 2014 -0400

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

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

http://github.com/horde/horde/commit/250b17517707596d73202a0942ba42a5c4628d7d