[commits] Horde branch develop updated. e846c4b2ba29f8c96a257f633c5373d33d2b6e85

[Michael M Slusarz]

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

from: a227f02e0dff856f5fdbc5fd1cc9957ceb3c6040

f56f977 Only attempt to lock if the backend supports it
313167e Avoid printing empty "BYDAY" field on RRULE
1021b0c Cleaner logic
6321ba1 Fix logic bug from cleanup
318fa59 [mms] Fix handling of RETURN keypress in the Subject input on the dynamic compose page.
e846c4b Merge branch 'master' into develop

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

commit f56f9776dd58b2552aeec08b2aeb96d9e0ed4057
Author: Ben Klang <bklang at horde.org>
Date:   Wed Apr 18 12:10:46 2012 -0400

    Only attempt to lock if the backend supports it

 framework/Auth/lib/Horde/Auth/Base.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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

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

commit 313167e52e31eb903cb603a04fb2594fda70213a
Author: Ben Klang <bklang at horde.org>
Date:   Thu Apr 19 14:53:23 2012 -0400

    Avoid printing empty "BYDAY" field on RRULE
    
    This fixes an RRULE parse error with OSX iCal

 framework/Date/lib/Horde/Date/Recurrence.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/313167e52e31eb903cb603a04fb2594fda70213a

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

commit 1021b0c8bc42ed0dbc6b1c91008605c2badd1987
Author: Ben Klang <bklang at horde.org>
Date:   Thu Apr 19 15:10:47 2012 -0400

    Cleaner logic

 framework/Date/lib/Horde/Date/Recurrence.php |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/1021b0c8bc42ed0dbc6b1c91008605c2badd1987

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

commit 6321ba18acf961c37e8e28449195b37ddf51a379
Author: Ben Klang <bklang at horde.org>
Date:   Thu Apr 19 15:34:17 2012 -0400

    Fix logic bug from cleanup

 framework/Date/lib/Horde/Date/Recurrence.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/6321ba18acf961c37e8e28449195b37ddf51a379

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

commit 318fa5905402a9d4bb93ed339dea8a34694bcd0f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 23 14:33:31 2012 -0600

    [mms] Fix handling of RETURN keypress in the Subject input on the dynamic compose page.

 imp/docs/CHANGES                        |    2 ++
 imp/package.xml                         |    2 ++
 imp/templates/dimp/compose/compose.html |    4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/318fa5905402a9d4bb93ed339dea8a34694bcd0f

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

commit e846c4b2ba29f8c96a257f633c5373d33d2b6e85
Merge: a227f02 318fa59
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 23 14:35:40 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/package.xml

 imp/docs/CHANGES                        |    2 ++
 imp/package.xml                         |   27 +++++----------------------
 imp/templates/dimp/compose/compose.html |    4 ++--
 3 files changed, 9 insertions(+), 24 deletions(-)

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