[commits] Horde branch master updated. 8e231e632ed4565e43bd7e6e91b9c12bc80d26f3

[Jan Schneider]

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

from: 29ee3502dacc8fba07c7b355dbe60dbbf0e5e7d1

a9354d9 [jan] Make spam level a required form field (Bug #12964).
8e231e6 [jan] Make spam level a required form field (Bug #12964).

Summary: http://github.com/horde/horde/compare/29ee3502dacc8fba07c7b355dbe60dbbf0e5e7d1...8e231e632ed4565e43bd7e6e91b9c12bc80d26f3

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

commit a9354d98136c3eff3b9c28d6b90d5a91c87c6025
Author: Jan Schneider <jan at horde.org>
Date:   Tue Feb 11 16:39:14 2014 +0100

    [jan] Make spam level a required form field (Bug #12964).

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

http://github.com/horde/horde/commit/a9354d98136c3eff3b9c28d6b90d5a91c87c6025
http://git.horde.org/horde-git/-/commit/a9354d98136c3eff3b9c28d6b90d5a91c87c6025

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

commit 8e231e632ed4565e43bd7e6e91b9c12bc80d26f3
Author: Jan Schneider <jan at horde.org>
Date:   Tue Feb 11 16:41:47 2014 +0100

    [jan] Make spam level a required form field (Bug #12964).
    
    Conflicts:
    	ingo/docs/CHANGES
    	ingo/package.xml

 ingo/docs/CHANGES |    1 +
 ingo/package.xml  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/8e231e632ed4565e43bd7e6e91b9c12bc80d26f3
http://git.horde.org/horde-git/-/commit/8e231e632ed4565e43bd7e6e91b9c12bc80d26f3