[commits] Horde branch turba_4_2 updated. b0041ed1e6e8da778a5ca81a5295327d0acd6b1a

[Michael J. Rubinsky]

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

from: e256c10579a1a750efcd6f8d2afa6c4eb0989065

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

Summary: http://github.com/horde/horde/compare/e256c10579a1a750efcd6f8d2afa6c4eb0989065...b0041ed1e6e8da778a5ca81a5295327d0acd6b1a

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

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 b0041ed1e6e8da778a5ca81a5295327d0acd6b1a
Merge: e256c10 246ccfa
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Nov 15 09:17:17 2013 -0500

    Merge branch 'master' into turba_4_2

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php  |    7 +++++++
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php |   11 +++++++++++
 nag/lib/Form/Task.php                                      |    2 +-
 3 files changed, 19 insertions(+), 1 deletions(-)

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