[commits] Horde branch nag_4_2 updated. f0268bee6c5c43a50536124a90b5ed24cc3ca995

[Michael J. Rubinsky]

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

from: c95c5e4a4c7bced7fa20686e41487b6a66c431ec

c0d151c Add pref for multiplex/separate collections.
f0268be Only clear state if we are using a multiplexed collection.

Summary: http://github.com/horde/horde/compare/c95c5e4a4c7bced7fa20686e41487b6a66c431ec...f0268bee6c5c43a50536124a90b5ed24cc3ca995

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

commit c0d151c243c3a155d4c8e01a97c95acac2fa14ce
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Nov 14 17:34:24 2013 -0500

    Add pref for multiplex/separate collections.

 nag/config/prefs.php |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

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

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

commit f0268bee6c5c43a50536124a90b5ed24cc3ca995
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Nov 14 17:36:01 2013 -0500

    Only clear state if we are using a multiplexed collection.

 nag/config/prefs.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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