[commits] Horde branch master updated. e3d480483087674481ea77ccdb1c315168cf8059

[Michael M Slusarz]

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

from: d6fe6a2bdc4d2f0b034ea44c090f7c78933be504

e3d4804 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