[commits] Horde branch nag_4_2 updated. 270e64be39f5c6a9eefa3eda749d6ad66dfce8d2

[Michael J. Rubinsky]

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

from: 01cfdd1d1610effc4a581c99a6a01646530abf45

7d433df Fix SQL syntax.
270e64b Merge branch 'master' into nag_4_2

Summary: http://github.com/horde/horde/compare/01cfdd1d1610effc4a581c99a6a01646530abf45...270e64be39f5c6a9eefa3eda749d6ad66dfce8d2

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

commit 7d433df632f4f3d139a1010f6e12cf55e6ce2eca
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 17 12:48:26 2013 -0500

    Fix SQL syntax.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 270e64be39f5c6a9eefa3eda749d6ad66dfce8d2
Merge: 01cfdd1 7d433df
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 17 12:52:58 2013 -0500

    Merge branch 'master' into nag_4_2

 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/270e64be39f5c6a9eefa3eda749d6ad66dfce8d2
http://git.horde.org/horde-git/-/commit/270e64be39f5c6a9eefa3eda749d6ad66dfce8d2