[commits] Horde branch master updated. e6c9fb68f0b7d0747169893fcf27b4414f3261cd

[Michael J. Rubinsky]

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

from: 07e00f45ff4c4aad72771bdd69c5b95125ac3abb

e9952a1 Get rid of some E_STRICT errors.
3859fbd Log the error if we have it.
48de084 Fix the $and portion of the aggregation.
ae4ea3ae Fix handling event descriptions if they are provided in HTML/RTF.
e6c9fb6 Check incoming appointments for HTML body types.

Summary: http://github.com/horde/horde/compare/07e00f45ff4c4aad72771bdd69c5b95125ac3abb...e6c9fb68f0b7d0747169893fcf27b4414f3261cd

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

commit e9952a156db7504904a05a122bab37147f2b5a95
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 22:31:14 2013 -0400

    Get rid of some E_STRICT errors.

 kronolith/lib/Driver/Resource/Sql.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

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

commit 3859fbd7914c963130d0499510bf651c29339012
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:17:14 2013 -0400

    Log the error if we have it.

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

http://github.com/horde/horde/commit/3859fbd7914c963130d0499510bf651c29339012
http://git.horde.org/horde-git/-/commit/3859fbd7914c963130d0499510bf651c29339012

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

commit 48de084df0dc5b34a7204a62edcdfa60d32b1de9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:17:37 2013 -0400

    Fix the $and portion of the aggregation.

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

http://github.com/horde/horde/commit/48de084df0dc5b34a7204a62edcdfa60d32b1de9
http://git.horde.org/horde-git/-/commit/48de084df0dc5b34a7204a62edcdfa60d32b1de9

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

commit ae4ea3aeeb6a8ab6e7f5ed735682782ad3e0bf65
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:18:48 2013 -0400

    Fix handling event descriptions if they are provided in HTML/RTF.
    
    Possible fix for Bug: 12797

 kronolith/lib/Event.php |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

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

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

commit e6c9fb68f0b7d0747169893fcf27b4414f3261cd
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:40:23 2013 -0400

    Check incoming appointments for HTML body types.

 kronolith/lib/Event.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

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