[commits] Horde branch ActiveSync updated. ca2257debd3a2ed7837bf9f858d9803173e0d6e6

[Michael Rubinsky]

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

from: 3d7d018e18fd19f21e1db69bd2d71570b956cbac

ca2257d fix improper rebase/merge conflict resolution

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

commit ca2257debd3a2ed7837bf9f858d9803173e0d6e6
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Mon Jan 25 14:57:00 2010 -0500

    fix improper rebase/merge conflict resolution

 horde/bin/db_migrate         |    3 ---
 skeleton/lib/Application.php |   20 --------------------
 2 files changed, 0 insertions(+), 23 deletions(-)

http://git.horde.org/diff.php/horde/bin/db_migrate?rt=horde-git&r1=cd25cd95f0209464d8ab035e36e3ad967e6c3824&r2=ca2257debd3a2ed7837bf9f858d9803173e0d6e6
http://git.horde.org/diff.php/skeleton/lib/Application.php?rt=horde-git&r1=cd25cd95f0209464d8ab035e36e3ad967e6c3824&r2=ca2257debd3a2ed7837bf9f858d9803173e0d6e6