[commits] Horde branch develop updated. c2846c2c7e41e6a11040c8c2c003fb1be1ae5a48

[Michael J. Rubinsky]

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

from: 04032bb153239ecd50c29af0522e13c2ababeca0

571b251 Horde LLC.
bdcaaec Disable group caching flag (Bug #10882).
3467d3b fix url to phpshell
c2846c2 Merge branch 'master' into develop

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

commit 571b251a3a5c0a68e91437ffb1d3fc45d7c8a84f
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jan 2 15:44:02 2012 +0100

    Horde LLC.

 horde/bin/horde-translation |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/571b251a3a5c0a68e91437ffb1d3fc45d7c8a84f

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

commit bdcaaec38dc313dd380a09416b6511c7775861bb
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jan 3 10:37:35 2012 +0100

    Disable group caching flag (Bug #10882).

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

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

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

commit 3467d3b91a851fee39d10e51e916aa7895193daf
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Jan 3 09:38:22 2012 -0500

    fix url to phpshell

 horde/admin/phpshell.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/3467d3b91a851fee39d10e51e916aa7895193daf

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

commit c2846c2c7e41e6a11040c8c2c003fb1be1ae5a48
Merge: 04032bb 3467d3b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Jan 3 09:41:02 2012 -0500

    Merge branch 'master' into develop

 horde/admin/phpshell.php    |    4 ++--
 horde/bin/horde-translation |    2 +-
 horde/config/conf.xml       |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

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