[commits] Horde branch kronolith_4_2 updated. f460fc31e5f380ec5c197f81a708d94a42b3221a

[Michael J. Rubinsky]

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

from: cf3fce9e08cf4b93426af14b8882d1ad1bc61996

f460fc3 Fix bad merge again.

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

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

commit f460fc31e5f380ec5c197f81a708d94a42b3221a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Sep 28 00:11:59 2013 -0400

    Fix bad merge again.

 framework/Mime/lib/Horde/Mime/Part.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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