[commits] Horde branch develop updated. 131192c19ebf24b1def4a28281bbbb206a794e0a

[Michael J. Rubinsky]

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

from: 6dd806c337aa17e04f73e86288198f589e297fdd

131192c Fix bad merge

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

commit 131192c19ebf24b1def4a28281bbbb206a794e0a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jul 22 11:42:34 2012 -0400

    Fix bad merge

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

http://git.horde.org/horde-git/-/commit/131192c19ebf24b1def4a28281bbbb206a794e0a