[commits] Horde branch kronolith_4_2 updated. b0bef963ffcbea836ecf752bf963ac0d763adf9f

[Michael J. Rubinsky]

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

from: f460fc31e5f380ec5c197f81a708d94a42b3221a

b0bef96 Remove merge conflict artifact.

Summary: http://github.com/horde/horde/compare/f460fc31e5f380ec5c197f81a708d94a42b3221a...b0bef963ffcbea836ecf752bf963ac0d763adf9f

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

commit b0bef963ffcbea836ecf752bf963ac0d763adf9f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Sep 28 00:16:01 2013 -0400

    Remove merge conflict artifact.

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

http://github.com/horde/horde/commit/b0bef963ffcbea836ecf752bf963ac0d763adf9f
http://git.horde.org/horde-git/-/commit/b0bef963ffcbea836ecf752bf963ac0d763adf9f