[commits] Horde branch develop updated. a1ce91170260bec87b23d36be6fb15fece7fce91

[Michael M Slusarz]

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

from: e1b03e6ee30b6d3daca7f8e9776584afe5f4634a

62ae2f7 [jan] Fix number of contacts in a list that cannot be displayed.
73257bf Add failing test for bug #11181.
6e220ad Fix error message if importing failed (Bug #11172).
7053f7a [mms] Fix Horde_String::validUtf8() to workaround PHP/PCRE bug where segfault will occur on input strings > ~5000 characters
bb6e324 Unneeded phpdoc since next version is 2.0
a1ce911 Merge branch 'master' into develop

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

commit 62ae2f7ef3e5439ffa26bb6a6da28fe49a8027ff
Author: Jan Schneider <jan at horde.org>
Date:   Mon May 7 18:12:49 2012 +0200

    [jan] Fix number of contacts in a list that cannot be displayed.

 turba/docs/CHANGES        |    1 +
 turba/lib/View/Browse.php |    2 +-
 turba/package.xml         |    2 ++
 3 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/62ae2f7ef3e5439ffa26bb6a6da28fe49a8027ff

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

commit 73257bf039e5631554918fd27f024ff8a77a6644
Author: Jan Schneider <jan at horde.org>
Date:   Wed May 9 16:11:46 2012 +0200

    Add failing test for bug #11181.

 framework/Date/test/Horde/Date/RecurrenceTest.php |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/73257bf039e5631554918fd27f024ff8a77a6644

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

commit 6e220ad639f143f8b144ab8a5eac5ad2e1eefdac
Author: Jan Schneider <jan at horde.org>
Date:   Wed May 9 16:23:50 2012 +0200

    Fix error message if importing failed (Bug #11172).

 kronolith/data.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/6e220ad639f143f8b144ab8a5eac5ad2e1eefdac

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

commit 7053f7ae5f7f735d288618d7a54e15c658d6e34c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed May 9 14:01:11 2012 -0600

    [mms] Fix Horde_String::validUtf8() to workaround PHP/PCRE bug where segfault will occur on input strings > ~5000 characters

 framework/Util/lib/Horde/String.php           |   21 +++++++++++++++++++++
 framework/Util/package.xml                    |    4 ++--
 framework/Util/test/Horde/Util/StringTest.php |    8 ++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/7053f7ae5f7f735d288618d7a54e15c658d6e34c

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

commit bb6e324e28b83a7b44a643c2331e3005362c161c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed May 9 13:43:33 2012 -0600

    Unneeded phpdoc since next version is 2.0

 framework/Util/lib/Horde/String.php    |    2 --
 framework/Util/lib/Horde/Variables.php |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

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

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

commit a1ce91170260bec87b23d36be6fb15fece7fce91
Merge: bb6e324 7053f7a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed May 9 14:03:09 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Util/package.xml
    	turba/package.xml

 framework/Date/test/Horde/Date/RecurrenceTest.php |   18 ++++++++++++++++++
 framework/Util/lib/Horde/String.php               |   21 +++++++++++++++++++++
 framework/Util/package.xml                        |    2 +-
 framework/Util/test/Horde/Util/StringTest.php     |    8 ++++++++
 kronolith/data.php                                |    4 ++--
 turba/docs/CHANGES                                |    1 +
 turba/lib/View/Browse.php                         |    2 +-
 turba/package.xml                                 |    1 +
 8 files changed, 53 insertions(+), 4 deletions(-)

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