[commits] Horde branch master updated. 577d3475ecc1d574a150cb8d59b626c37afea47d

[Jan Schneider]

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

from: 32249751c6668b3ab941ad90004439cb2d0bc271

577d347 Fix Horde_Share: test fails (Bug #11966)

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

commit 577d3475ecc1d574a150cb8d59b626c37afea47d
Author: Remi Collet <fedora at famillecollet.com>
Date:   Wed Jan 16 08:50:19 2013 +0100

    Fix Horde_Share: test fails (Bug #11966)
    
    Rename Horde_Share_Test_Base::callback() to callbackSetShareOb()
    Avoid name conflict with PHPUnit_Framework_Assert::callback()
    
    Signed-off-by: Jan Schneider <jan at horde.org>

 framework/Share/test/Horde/Share/Base.php           |    2 +-
 framework/Share/test/Horde/Share/Kolab/MockTest.php |    4 ++--
 framework/Share/test/Horde/Share/Sql/Base.php       |    2 +-
 framework/Share/test/Horde/Share/Sqlng/Base.php     |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/577d3475ecc1d574a150cb8d59b626c37afea47d