[commits] Horde branch master updated. 8df3f79040c191550966e32c043861268cd7d94a

[Michael Rubinsky]

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

from: c1f241be16aa88a278d0e51fc7baa78e39008cca

8df3f79 Fix array_merge usage.

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

commit 8df3f79040c191550966e32c043861268cd7d94a
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 30 18:09:17 2010 -0400

    Fix array_merge usage.

 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php?rt=horde-git&r1=95c4c936bee17d6326310e3e34bb99d401db7dde&r2=8df3f79040c191550966e32c043861268cd7d94a