[commits] Horde branch develop updated. 258e6e41e1716a75f5d29e2322df8755568ded80

[Michael M Slusarz]

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

from: 4ce047f6fe0372f7c42c85a740e956fa1d461844

303082e Do invalid-email check in IMP_Compose#recipientList()
aa188f7 Merge branch 'master' into develop
432c3b6 This got lost when merging from develop
258e6e4 Merge branch 'master' into develop

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

commit 303082e9f33bc3be1b607b9cbc22b04e62d1c44b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 9 14:38:57 2012 -0700

    Do invalid-email check in IMP_Compose#recipientList()

 imp/lib/Compose.php |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/303082e9f33bc3be1b607b9cbc22b04e62d1c44b

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

commit aa188f70450f00e3c2a3ead205ed4c1e81a253ae
Merge: 4ce047f 303082e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 9 14:41:40 2012 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/lib/Compose.php

 imp/lib/Compose.php |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

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

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

commit 432c3b63b6427ee1eb72fb60a413f1de6fd1a956
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 9 14:42:18 2012 -0700

    This got lost when merging from develop

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

http://git.horde.org/horde-git/-/commit/432c3b63b6427ee1eb72fb60a413f1de6fd1a956

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

commit 258e6e41e1716a75f5d29e2322df8755568ded80
Merge: aa188f7 432c3b6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Feb 9 14:43:07 2012 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/lib/Compose.php


http://git.horde.org/horde-git/-/commit/258e6e41e1716a75f5d29e2322df8755568ded80