[commits] Horde branch master updated. 0397f464bb48d2d448ec094252bb11380d15f021

[Michael M Slusarz]

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

from: 179b8dfa9c68c7fd5fe9a8739dd7f4e4ed7918ab

d79e777 Bug #9238: We shouldn't add prefs that are locked on Horde.
0397f46 Bug #9239: Make sure instance is a tree object

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

commit d79e77776adce0aaca7b21b8dc80ca86a3e28481
Author: Rui Carneiro <rui.carneiro at portugalmail.net>
Date:   Wed Sep 8 12:45:10 2010 +0100

    Bug #9238: We shouldn't add prefs that are locked on Horde.

 framework/Core/lib/Horde/Core/Prefs/Ui.php |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Prefs/Ui.php?rt=horde-git&r1=bca4bb776d6645ae465c404dd7c57694ae703c16&r2=d79e77776adce0aaca7b21b8dc80ca86a3e28481

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

commit 0397f464bb48d2d448ec094252bb11380d15f021
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Wed Sep 8 11:19:47 2010 -0600

    Bug #9239: Make sure instance is a tree object

 imp/lib/Injector/Binder/Imaptree.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/imp/lib/Injector/Binder/Imaptree.php?rt=horde-git&r1=6e1c57025b1661dd1a5a0e226241ef0fa2223209&r2=0397f464bb48d2d448ec094252bb11380d15f021