[commits] Horde branch develop updated. 29ea73188b93e157bcde27fdff93e560650bceb8

[Michael M Slusarz]

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

from: 45a477ae970d3a52dbe2b16b760b4d8f50793060

01afa79 Only loop over the stats if we didn't catch an exception (Bug #11221).
95ef4d0 Update hook example to use Horde_Db.
93efe59 [mms] Procmail driver now explicitly sets the base Maildir directory by default (Bug #10113).
29ea731 Merge branch 'master' into develop

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

commit 01afa7996dd225ad5e164e0caa440b6d5cdff1d7
Author: Jan Schneider <jan at horde.org>
Date:   Sat Jun 16 19:40:47 2012 +0200

    Only loop over the stats if we didn't catch an exception (Bug #11221).

 whups/templates/reports/stats.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/01afa7996dd225ad5e164e0caa440b6d5cdff1d7

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

commit 95ef4d0186d70bfaa11ffe3192316f23d2a06781
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jun 18 13:40:43 2012 +0200

    Update hook example to use Horde_Db.

 horde/config/hooks.php.dist |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/95ef4d0186d70bfaa11ffe3192316f23d2a06781

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

commit 93efe59890c2fe6c6f89b20173da639c0ed8d1e8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jun 20 14:12:31 2012 -0600

    [mms] Procmail driver now explicitly sets the base Maildir directory by default (Bug #10113).

 ingo/config/backends.php |   10 ++++++----
 ingo/docs/CHANGES        |    2 ++
 ingo/package.xml         |    2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/93efe59890c2fe6c6f89b20173da639c0ed8d1e8

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

commit 29ea73188b93e157bcde27fdff93e560650bceb8
Merge: 45a477a 93efe59
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jun 20 14:13:38 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	ingo/package.xml

 horde/config/hooks.php.dist       |   20 +++++++++-----------
 ingo/config/backends.php          |   10 ++++++----
 ingo/docs/CHANGES                 |    2 ++
 ingo/package.xml                  |    1 +
 whups/templates/reports/stats.inc |    4 +++-
 5 files changed, 21 insertions(+), 16 deletions(-)

http://git.horde.org/horde-git/-/commit/29ea73188b93e157bcde27fdff93e560650bceb8