[commits] Horde branch nag_4_2 updated. 2289a7b8f3b01eb4d25e1d8cd2a41115c6a479cc

[Michael J. Rubinsky]

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

from: 8820cd25f24fe32970c0f6cc3e9af4e3d4af0f0f

4a1b7e7 Don't include SmartLists on the Task form.
246ccfa Better status codes for PING request when the state disappears.
2289a7b Merge branch 'master' into nag_4_2

Summary: http://github.com/horde/horde/compare/8820cd25f24fe32970c0f6cc3e9af4e3d4af0f0f...2289a7b8f3b01eb4d25e1d8cd2a41115c6a479cc

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

commit 4a1b7e7ffa9fd6f3ab04bdd9dff93037714ae80a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Nov 14 18:43:06 2013 -0500

    Don't include SmartLists on the Task form.

 nag/lib/Form/Task.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/4a1b7e7ffa9fd6f3ab04bdd9dff93037714ae80a
http://git.horde.org/horde-git/-/commit/4a1b7e7ffa9fd6f3ab04bdd9dff93037714ae80a

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

commit 246ccfa0287ba17d5907715ee82ff1dda0d66f9d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Nov 14 20:08:00 2013 -0500

    Better status codes for PING request when the state disappears.

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php  |    7 +++++++
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php |   11 +++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/246ccfa0287ba17d5907715ee82ff1dda0d66f9d
http://git.horde.org/horde-git/-/commit/246ccfa0287ba17d5907715ee82ff1dda0d66f9d

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

commit 2289a7b8f3b01eb4d25e1d8cd2a41115c6a479cc
Merge: 8820cd2 246ccfa
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Nov 15 09:17:56 2013 -0500

    Merge branch 'master' into nag_4_2

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php  |    7 +++++++
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php |   11 +++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/2289a7b8f3b01eb4d25e1d8cd2a41115c6a479cc
http://git.horde.org/horde-git/-/commit/2289a7b8f3b01eb4d25e1d8cd2a41115c6a479cc