[commits] Horde branch master updated. f6da7e9626c453cf3930b7e29704376b0e8838f8

[Michael M Slusarz]

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

from: eea10d24768669636d419c737baddc91f43cbc67

0605a11 [mms] Fix POP3 regression that broken envelope data parsing (Bug #11477).
f6da7e9 [mms] Add predefined templates to ACL management screen (Request #10648).

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

commit 0605a111e2b6a65484d911939f6e3cdc127dd15c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Oct 8 18:46:39 2012 -0600

    [mms] Fix POP3 regression that broken envelope data parsing (Bug #11477).
    
    Conflicts:
    	framework/Imap_Client/package.xml

 framework/Imap_Client/package.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/0605a111e2b6a65484d911939f6e3cdc127dd15c

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

commit f6da7e9626c453cf3930b7e29704376b0e8838f8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Oct 9 09:26:04 2012 -0600

    [mms] Add predefined templates to ACL management screen (Request #10648).

 imp/docs/CHANGES                 |    1 +
 imp/js/acl.js                    |   10 ++++++++++
 imp/lib/Prefs/Special/Acl.php    |    2 +-
 imp/package.xml                  |    2 ++
 imp/templates/prefs/acl.html.php |   31 +++++++++++++++++++++++++++++--
 5 files changed, 43 insertions(+), 3 deletions(-)

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