[commits] Horde branch master updated. 70ad1361e25088ff5cf8f2a2b6de9ec792bce3cf

[Michael M Slusarz]

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

from: c0534445e08c024e1411d6e6842dcbd605193a0c

70ad136 2nd attempt at fixing botched merge

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

commit 70ad1361e25088ff5cf8f2a2b6de9ec792bce3cf
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 15:05:47 2012 -0700

    2nd attempt at fixing botched merge

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

http://git.horde.org/horde-git/-/commit/70ad1361e25088ff5cf8f2a2b6de9ec792bce3cf