[commits] Horde branch master updated. 9cfd71bf05b14b3201158bb31481ad59586bbad9

[Jan Schneider]

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

from: 87f124e8dc2ca6c1bb52fd4bd7da6f60c57bec3a

4d33561 The header results are arrays at this point.
2fd5f40 Move Themes tab.
9cfd71b [jan] Add configuration option to disable password resets (Request #10640).

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

commit 4d33561911379a84fbd6c57e5f7774a67b7a30c8
Author: Jan Schneider <jan at horde.org>
Date:   Wed Nov 2 16:19:06 2011 +0100

    The header results are arrays at this point.
    
    Not sure if more fixes like this need to applied further down, but this at
    least fixes array-to-string conversions for me.

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

http://git.horde.org/horde-git/-/commit/4d33561911379a84fbd6c57e5f7774a67b7a30c8

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

commit 2fd5f407a96edbbade0176d3faea853cfbde5c8d
Author: Jan Schneider <jan at horde.org>
Date:   Wed Nov 2 18:51:09 2011 +0100

    Move Themes tab.

 horde/config/conf.xml |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/2fd5f407a96edbbade0176d3faea853cfbde5c8d

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

commit 9cfd71bf05b14b3201158bb31481ad59586bbad9
Author: Jan Schneider <jan at horde.org>
Date:   Wed Nov 2 18:57:08 2011 +0100

    [jan] Add configuration option to disable password resets (Request #10640).

 horde/config/conf.xml            |    2 ++
 horde/docs/CHANGES               |    1 +
 horde/package.xml                |    4 ++--
 horde/services/resetpassword.php |    3 ++-
 horde/templates/login/login.inc  |    4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)

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