[commits] Horde branch develop updated. d7a3b653da4a1b7c3a62df8c8aa7bd5374cc74cc

[Jan Schneider]

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

from: 7f009987a7f1baceb86baed921ff89b51fddbc81

5d451ac spacing
0e6283e Fix saving portal block parameters.
d7a3b65 Merge branch 'master' into develop

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

commit 5d451ac673fea03ce1e9f21919e19447664eb1c3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Feb 18 20:24:57 2012 -0500

    spacing

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

http://git.horde.org/horde-git/-/commit/5d451ac673fea03ce1e9f21919e19447664eb1c3

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

commit 0e6283e4253989c2b96d7b4fdd16efecc62beec6
Author: Jan Schneider <jan at horde.org>
Date:   Mon Feb 27 15:46:33 2012 +0100

    Fix saving portal block parameters.

 ansel/browse_edit.php |    7 +++++--
 ansel/docs/CHANGES    |    1 +
 ansel/package.xml     |    2 ++
 whups/docs/CHANGES    |    1 +
 whups/mybugs_edit.php |    7 +++++--
 whups/package.xml     |    2 ++
 6 files changed, 16 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/0e6283e4253989c2b96d7b4fdd16efecc62beec6

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

commit d7a3b653da4a1b7c3a62df8c8aa7bd5374cc74cc
Merge: 7f00998 0e6283e
Author: Jan Schneider <jan at horde.org>
Date:   Mon Feb 27 15:52:53 2012 +0100

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

 ansel/browse_edit.php |    7 +++++--
 ansel/docs/CHANGES    |    1 +
 ansel/package.xml     |    1 +
 whups/docs/CHANGES    |    1 +
 whups/mybugs_edit.php |    7 +++++--
 whups/package.xml     |    2 ++
 6 files changed, 15 insertions(+), 4 deletions(-)

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