[commits] Horde branch develop updated. b825543dda31c13d990ba51e6a2213ee99090ec4

[Jan Schneider]

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

from: fe610b773e40f3189dc260b0c9c98ece54a5f515

e3fb491 Avoid undefined index notice.
b20442a Make sure this is serialized to an array, not a hash/object.
9e6b9ec Extra top line for login form notifications.
3a3f006 Fix permission check when merging and renaming pages (Bug #11332).
3281ff2 Use instanceof.
b825543 Fix changelog.

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

commit e3fb4916159d8445d25b7b318f50e748659c253d
Author: Jan Schneider <jan at horde.org>
Date:   Mon Aug 13 14:44:07 2012 +0200

    Avoid undefined index notice.

 imp/templates/dynamic/message.html.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit b20442a5fbf40f44153684497baaed808476902b
Author: Jan Schneider <jan at horde.org>
Date:   Mon Aug 13 15:43:08 2012 +0200

    Make sure this is serialized to an array, not a hash/object.

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

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

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

commit 9e6b9ec0f93c0430c9960659c75b059c78ac7a32
Author: Jan Schneider <jan at horde.org>
Date:   Tue Aug 14 10:57:25 2012 +0200

    Extra top line for login form notifications.

 horde/themes/default/screen.css |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/9e6b9ec0f93c0430c9960659c75b059c78ac7a32

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

commit 3a3f006f0eb9fdde5cf5151f487941db3b294844
Author: Jan Schneider <jan at horde.org>
Date:   Wed Aug 15 18:40:05 2012 +0200

    Fix permission check when merging and renaming pages (Bug #11332).
    
    Conflicts:
    
    	wicked/package.xml

 wicked/docs/CHANGES               |    1 +
 wicked/lib/Page/MergeOrRename.php |    3 ++-
 wicked/package.xml                |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/3a3f006f0eb9fdde5cf5151f487941db3b294844

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

commit 3281ff28539980197bcf3f0e26de1b14cb06f8d4
Author: Jan Schneider <jan at horde.org>
Date:   Wed Aug 15 18:43:03 2012 +0200

    Use instanceof.

 wicked/bin/wicked                  |    2 +-
 wicked/templates/edit/standard.inc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/3281ff28539980197bcf3f0e26de1b14cb06f8d4

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

commit b825543dda31c13d990ba51e6a2213ee99090ec4
Author: Jan Schneider <jan at horde.org>
Date:   Wed Aug 15 18:46:17 2012 +0200

    Fix changelog.
    
    Conflicts:
    
    	wicked/package.xml

 wicked/docs/CHANGES |    2 +-
 wicked/package.xml  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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