[commits] Horde-Hatchery branch master updated.

[Michael Rubinsky]

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

from: cfb05c70313dc382b67f984f7f718f24b3b3bfb1

dc82ad3... resolve conflict, comment out my custom database code that I use for profiling these tests.

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

commit dc82ad3749871f2fe0f7431f172ceb0f44396432
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Jun 10 12:28:50 2009 -0400

    resolve conflict, comment out my custom database code that I use
    for profiling these tests.

 framework/Image/tests/im.php |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/framework/Image/tests/im.php?rt=horde-hatchery&r1=78fd3f9eaf63e8d7c79a458a73e2a14a3ae7ca97&r2=dc82ad3749871f2fe0f7431f172ceb0f44396432