[commits] Horde branch master updated. 2b2e53c6f799d850a39bc2b351e145459642340b

[Michael J. Rubinsky]

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

from: 92777395c80c6ae515570038e14afb47ceb27175

df3d771 One more place this can be fixed.
f9c4b50 Fix fatal crash on sending back incoming sync conflict status. Bug #12755
2b2e53c BFN

Summary: http://github.com/horde/horde/compare/92777395c80c6ae515570038e14afb47ceb27175...2b2e53c6f799d850a39bc2b351e145459642340b

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

commit df3d771ddb15bf97bb751ef57a6e22ec0488b3c7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 09:31:07 2013 -0400

    One more place this can be fixed.

 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

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

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

commit f9c4b502d2dc49480c59d594bb2b3d153bcaa724
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date:   Fri Oct 11 12:46:46 2013 +0200

    Fix fatal crash on sending back incoming sync conflict status. Bug #12755
    
    Two PHP error message get fixed:
    PHP Fatal error:  Undefined class constant 'SYNC_CHANGE' in /usr/share/pear/Horde/ActiveSync/Request/Sync.php on line 516
    PHP Fatal error:  Call to a member function content() on a non-object in /usr/share/pear/Horde/ActiveSync/Request/Sync.php on line 518
    
    Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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

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

commit 2b2e53c6f799d850a39bc2b351e145459642340b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 09:35:28 2013 -0400

    BFN

 framework/ActiveSync/package.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/2b2e53c6f799d850a39bc2b351e145459642340b
http://git.horde.org/horde-git/-/commit/2b2e53c6f799d850a39bc2b351e145459642340b