[commits] Horde branch activesync_2_9_0 updated. 6a01ec1b08e7303183930902afc9a4c4ef4d12b9

[Michael J. Rubinsky]

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

from: bbd234466895acd0006db0ebb2e81a5bdcbc9880

7d4a2a5 Changes
6a01ec1 Merge branch 'master' into activesync_2_9_0

Summary: http://github.com/horde/horde/compare/bbd234466895acd0006db0ebb2e81a5bdcbc9880...6a01ec1b08e7303183930902afc9a4c4ef4d12b9

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

commit 7d4a2a5d27cbbd7f3606d5395e894cc3df8d85df
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 13:17:42 2013 -0400

    Changes

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

http://github.com/horde/horde/commit/7d4a2a5d27cbbd7f3606d5395e894cc3df8d85df
http://git.horde.org/horde-git/-/commit/7d4a2a5d27cbbd7f3606d5395e894cc3df8d85df

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

commit 6a01ec1b08e7303183930902afc9a4c4ef4d12b9
Merge: bbd2344 7d4a2a5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 13:19:23 2013 -0400

    Merge branch 'master' into activesync_2_9_0
    
    Conflicts:
    	framework/ActiveSync/package.xml

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

http://github.com/horde/horde/commit/6a01ec1b08e7303183930902afc9a4c4ef4d12b9
http://git.horde.org/horde-git/-/commit/6a01ec1b08e7303183930902afc9a4c4ef4d12b9