[commits] Horde branch develop updated. 09d8a8bd356c7dac0078e0cd3cc4ae17ea6059ca

[Michael J. Rubinsky]

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

from: 562e555ab52f8ce59cd4c9dd8f5eae79b22611e3

09d8a8b Fix uncaught conflict

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

commit 09d8a8bd356c7dac0078e0cd3cc4ae17ea6059ca
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 19 21:06:19 2011 -0500

    Fix uncaught conflict

 framework/Core/package.xml |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/09d8a8bd356c7dac0078e0cd3cc4ae17ea6059ca