[commits] Horde branch master updated. c5b308b49578c582e5ab89908a99cfa8504884ef

[Michael J. Rubinsky]

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

from: 4ace7aaa8cb909c327d545ff3ccd7c8bfaadd928

9b3e0ad BFN
c5b308b BFN

Summary: http://github.com/horde/horde/compare/4ace7aaa8cb909c327d545ff3ccd7c8bfaadd928...c5b308b49578c582e5ab89908a99cfa8504884ef

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

commit 9b3e0ad212ff321843dd76327911d9bf5da34508
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 21 00:28:34 2014 -0400

    BFN
    
    Conflicts:
    	nag/docs/CHANGES

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

http://github.com/horde/horde/commit/9b3e0ad212ff321843dd76327911d9bf5da34508

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

commit c5b308b49578c582e5ab89908a99cfa8504884ef
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 21 00:32:18 2014 -0400

    BFN

 framework/ActiveSync/package.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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