[commits] Horde branch master updated. 5b9531b07268975aa608d5c7bb4219aa50b104ff

[Ralf Lang]

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

from: c037f4a66a477ccd72e739850c37f558e0d202b8

178403f 	modified:   horde.php Applied jan's suggestions (00:22:35) yunosh: re your driver: $registry is already set in global scope. and the method is called raiseError() (00:22:57) yunosh: and the $Horde: line should go away
5b9531b Merge branch 'master' of ssh://dev.horde.org/horde/git/horde

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

commit 178403f4f3df484d3d8dc2f3fa6b3e8835ef2683
Author: Ralf Lang <lang at b1-systems.de>
Date:   Mon May 16 23:34:29 2011 +0000

    	modified:   horde.php
    Applied jan's suggestions
    (00:22:35) yunosh: re your driver: $registry is already set in global scope. and the method is called raiseError()
    (00:22:57) yunosh: and the $Horde: line should go away

 passwd/lib/Driver/horde.php |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/178403f4f3df484d3d8dc2f3fa6b3e8835ef2683

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

commit 5b9531b07268975aa608d5c7bb4219aa50b104ff
Merge: 178403f c037f4a
Author: Ralf Lang <lang at b1-systems.de>
Date:   Mon May 16 23:42:51 2011 +0000

    Merge branch 'master' of ssh://dev.horde.org/horde/git/horde
    
    Conflicts:
    	passwd/lib/Driver/horde.php

 framework/Imap_Client/lib/Horde/Imap/Client/Utf7imap.php |    2 +-
 passwd/lib/Driver/horde.php                              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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