[commits] Horde branch develop updated. b3f34852cdce06001d6f3addb0551cd318a303d0

[Michael M Slusarz]

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

from: 1f719d05081bc3f8d557350e2fe05a5f46693a53

b3f3485 Revert "Fix folder names in Procmail rules if using Maildir (Bug 10113)."

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

commit b3f34852cdce06001d6f3addb0551cd318a303d0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jun 20 13:40:56 2012 -0600

    Revert "Fix folder names in Procmail rules if using Maildir (Bug 10113)."
    
    This reverts commit f42cae5d096f0307e27aaf3b9065dba176cd5694.
    
    Conflicts:
    	ingo/docs/CHANGES
    	ingo/package.xml

 ingo/config/backends.php            |    2 --
 ingo/docs/CHANGES                   |    1 -
 ingo/lib/Script/Procmail/Recipe.php |   15 ++++++++++-----
 ingo/package.xml                    |    1 -
 4 files changed, 10 insertions(+), 9 deletions(-)

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