[commits] Horde branch master updated. 472de0093b4ba7232ae7735d910e8e5953d800fa

[Gunnar Wrobel]

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

from: 22e49e860c9b5d95d0efae1a981735334794ffd1

2ff9268 Fix dealing with sub-tasks.
86c535e Merge branch 'master' of ssh://dev.horde.org/horde/git/horde
472de00 [gwr] Improve detection of the lib directory.

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

commit 2ff92681a45b99bc957616f0cc1835c4b1f9a2d0
Author: Gunnar Wrobel <p at rdus.de>
Date:   Tue Jun 21 08:14:46 2011 +0200

    Fix dealing with sub-tasks.

 nag/lib/Driver/Kolab.php               |    2 +-
 nag/test/Nag/Unit/Driver/KolabTest.php |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/2ff92681a45b99bc957616f0cc1835c4b1f9a2d0

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

commit 86c535ea9c03d869f5f860dd144c77c5816cb6b5
Merge: 2ff9268 22e49e8
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Jun 22 05:56:47 2011 +0200

    Merge branch 'master' of ssh://dev.horde.org/horde/git/horde

 framework/ActiveSync/lib/Horde/ActiveSync.php                    |    5 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php |    8 +++
 framework/ActiveSync/lib/Horde/ActiveSync/State/History.php      |   16 +++--
 framework/Crypt/lib/Horde/Crypt/Smime.php                        |   18 ++++-
 framework/Crypt/package.xml                                      |   10 ++--
 framework/Test/lib/Horde/Test/AllTests.php                       |    6 +-
 framework/Token/lib/Horde/Token/Base.php                         |    7 +--
 imp/docs/CHANGES                                                 |    1 +
 imp/package.xml                                                  |    2 +
 imp/view.php                                                     |   15 ++++-
 10 files changed, 58 insertions(+), 30 deletions(-)

http://git.horde.org/horde-git/-/commit/86c535ea9c03d869f5f860dd144c77c5816cb6b5

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

commit 472de0093b4ba7232ae7735d910e8e5953d800fa
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Jun 22 06:12:18 2011 +0200

    [gwr] Improve detection of the lib directory.

 framework/Test/lib/Horde/Test/AllTests.php |   18 +++++++++++++++++-
 framework/Test/package.xml                 |    2 ++
 2 files changed, 19 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/472de0093b4ba7232ae7735d910e8e5953d800fa