[commits] Horde branch develop updated. 896926294cff6a96b1660f67dad6f5be85acc0a2

[Michael M Slusarz]

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

from: b08c4e3e4bdbca40891fe2a3fdda160ca82e8558

e3d4804 Botched merge from develop
5748c09 Merge branch 'master' into develop
8969262 Revert "Botched merge from develop"

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

commit e3d480483087674481ea77ccdb1c315168cf8059
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 9 23:47:28 2012 -0700

    Botched merge from develop

 imp/lib/Spam.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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

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

commit 5748c093aced92e4f34f697a64a189b114cc8b44
Merge: b08c4e3 e3d4804
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 9 23:48:07 2012 -0700

    Merge branch 'master' into develop

 imp/lib/Spam.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/5748c093aced92e4f34f697a64a189b114cc8b44

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

commit 896926294cff6a96b1660f67dad6f5be85acc0a2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 9 23:48:30 2012 -0700

    Revert "Botched merge from develop"
    
    This reverts commit e3d480483087674481ea77ccdb1c315168cf8059.
    
    Not needed in develop.

 imp/lib/Spam.php |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/896926294cff6a96b1660f67dad6f5be85acc0a2