[commits] Horde branch develop updated. 8f93777cc2bc2596a5c2dada8e5d3678fb56f498

[Michael M Slusarz]

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

from: 11e1e868c6d1494323fe42f97f5b5a09eae71dce

880df14 [rla] fix [#11012] Horde_Rdo calls non-existing Horde_Db method for lazy fields
07b56af More elegant version of previous bugfix
aef5a56 Bug #11015: Only do these actions if authenticated
8730571 Another fix for the broken merge
a03c3cd Merge branch 'master' into develop
8f93777 Revert "Another fix for the broken merge"

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

commit 880df148eb3bf83c1ec732534f2ce299a8c98a96
Author: Ralf Lang <lang at b1-systems.de>
Date:   Mon Feb 20 12:59:41 2012 +0000

    [rla] fix [#11012] Horde_Rdo calls non-existing Horde_Db method for lazy fields

 framework/Rdo/lib/Horde/Rdo/Base.php |    4 +++-
 framework/Rdo/package.xml            |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/880df148eb3bf83c1ec732534f2ce299a8c98a96

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

commit 07b56afb1861bb5ba7ea1a5638489558b11dcd44
Author: Ralf Lang <lang at b1-systems.de>
Date:   Mon Feb 20 13:42:40 2012 +0000

    More elegant version of previous bugfix

 framework/Rdo/lib/Horde/Rdo/Base.php |    3 +--
 framework/Rdo/package.xml            |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/07b56afb1861bb5ba7ea1a5638489558b11dcd44

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

commit aef5a56a6c2e40bcca7ea4f9a213ca9f689ede70
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 20 14:28:19 2012 -0700

    Bug #11015: Only do these actions if authenticated

 imp/lib/Application.php |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

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

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

commit 87305716994e1b66d255d80cdfeccf833a4be125
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 20 21:36:54 2012 -0700

    Another fix for the broken merge

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

http://git.horde.org/horde-git/-/commit/87305716994e1b66d255d80cdfeccf833a4be125

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

commit a03c3cd01c2cb1d5e79c4c3fa43d4228e7af5bb2
Merge: 11e1e86 8730571
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 20 21:37:56 2012 -0700

    Merge branch 'master' into develop

 framework/Rdo/lib/Horde/Rdo/Base.php |    3 ++-
 framework/Rdo/package.xml            |    4 ++--
 imp/lib/Application.php              |   15 +++++++++------
 imp/lib/Compose.php                  |   10 ++++++----
 4 files changed, 19 insertions(+), 13 deletions(-)

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

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

commit 8f93777cc2bc2596a5c2dada8e5d3678fb56f498
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Feb 20 21:38:25 2012 -0700

    Revert "Another fix for the broken merge"
    
    This reverts commit 87305716994e1b66d255d80cdfeccf833a4be125.
    
    This is not needed for IMP 5.1

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

http://git.horde.org/horde-git/-/commit/8f93777cc2bc2596a5c2dada8e5d3678fb56f498