[commits] Horde branch turba_4_2 updated. cac7b30292a210172192a16628bef55ab8196b8b

[Michael J. Rubinsky]

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

from: 489e238b8a4ac8c95074176711e5932064388d4c

7d433df Fix SQL syntax.
cac7b30 Merge branch 'master' into turba_4_2

Summary: http://github.com/horde/horde/compare/489e238b8a4ac8c95074176711e5932064388d4c...cac7b30292a210172192a16628bef55ab8196b8b

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

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 cac7b30292a210172192a16628bef55ab8196b8b
Merge: 489e238 7d433df
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 17 12:52:30 2013 -0500

    Merge branch 'master' into turba_4_2

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

http://github.com/horde/horde/commit/cac7b30292a210172192a16628bef55ab8196b8b
http://git.horde.org/horde-git/-/commit/cac7b30292a210172192a16628bef55ab8196b8b