[commits] Horde branch master updated. 155cf1899b42bb35b1268ba6d7a26fe5cb5f8de7

[Michael J. Rubinsky]

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

from: 910bc6df306c40478ff2ae5d73607772872532fc

5468598 Revert "Don't use regex to avoid php segfaults here."
df855c4 Bug: 11919 Fix variable name. Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>
155cf18 BFN

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

commit 5468598e4a91b2e47b16f7a71a46b49e34c477e8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 25 16:54:07 2012 -0500

    Revert "Don't use regex to avoid php segfaults here."
    
    This reverts commit 910bc6df306c40478ff2ae5d73607772872532fc.

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

http://git.horde.org/horde-git/-/commit/5468598e4a91b2e47b16f7a71a46b49e34c477e8

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

commit df855c4671f58bfc36468b6c76ce7f10656a668f
Author: martin.ament at gmx.de <martin.ament at gmx.de>
Date:   Tue Dec 25 16:55:42 2012 -0500

    Bug: 11919 Fix variable name.
    Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>

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

http://git.horde.org/horde-git/-/commit/df855c4671f58bfc36468b6c76ce7f10656a668f

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

commit 155cf1899b42bb35b1268ba6d7a26fe5cb5f8de7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 25 16:56:54 2012 -0500

    BFN

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

http://git.horde.org/horde-git/-/commit/155cf1899b42bb35b1268ba6d7a26fe5cb5f8de7