[commits] Horde branch master updated. e990984a0b8c4a46791660a38996bf1ca2eabb15

[Chuck Hagenbuch]

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

from: e337410fe6149236cff08477e4dbb503bd4b2f64

ecb5e2c Revert "addOndemandBinder -> addBinder"
e990984 Revert "Use ondemand injector binding throughout Horde"

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

commit ecb5e2c1bbb37f8d65e1adc3f150168e1188db2e
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Sun Oct 3 11:24:26 2010 -0400

    Revert "addOndemandBinder -> addBinder"
    
    This reverts commit e337410fe6149236cff08477e4dbb503bd4b2f64.

 framework/Core/lib/Horde/Registry.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Registry.php?rt=horde-git&r1=e337410fe6149236cff08477e4dbb503bd4b2f64&r2=ecb5e2c1bbb37f8d65e1adc3f150168e1188db2e

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

commit e990984a0b8c4a46791660a38996bf1ca2eabb15
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Sun Oct 3 11:33:44 2010 -0400

    Revert "Use ondemand injector binding throughout Horde"
    
    This reverts commit 3b84d04919accf91428a760b2ba7921a543d3909.
    
    Conflicts:
    
    	framework/Core/lib/Horde/Registry.php
    	imp/lib/Application.php

 ansel/lib/Application.php             |    8 ++--
 framework/Core/lib/Horde/Registry.php |   60 ++++++++++++++++-----------------
 horde/lib/Prefs/Ui.php                |    2 +
 imp/lib/Application.php               |   30 ++++++++--------
 jonah/lib/Application.php             |    2 +-
 turba/lib/Application.php             |    4 +-
 6 files changed, 53 insertions(+), 53 deletions(-)

http://git.horde.org/diff.php/ansel/lib/Application.php?rt=horde-git&r1=ef709f2b554aee5c7b9b2d3e075dc9831d4f0081&r2=e990984a0b8c4a46791660a38996bf1ca2eabb15
http://git.horde.org/diff.php/framework/Core/lib/Horde/Registry.php?rt=horde-git&r1=ecb5e2c1bbb37f8d65e1adc3f150168e1188db2e&r2=e990984a0b8c4a46791660a38996bf1ca2eabb15
http://git.horde.org/diff.php/horde/lib/Prefs/Ui.php?rt=horde-git&r1=c5626b8713d562b24f7aedd8a1aebbfc4eba37f0&r2=e990984a0b8c4a46791660a38996bf1ca2eabb15
http://git.horde.org/diff.php/imp/lib/Application.php?rt=horde-git&r1=084ea89feb94f9aece305ae7f69f9ca61825b15a&r2=e990984a0b8c4a46791660a38996bf1ca2eabb15
http://git.horde.org/diff.php/jonah/lib/Application.php?rt=horde-git&r1=c96f324b15ac69771b12278f33027c47a425fefa&r2=e990984a0b8c4a46791660a38996bf1ca2eabb15
http://git.horde.org/diff.php/turba/lib/Application.php?rt=horde-git&r1=5e2aada36a2e49c455135a302c0e57b058cfa8a7&r2=e990984a0b8c4a46791660a38996bf1ca2eabb15