[commits] Horde branch kronolith_4_2 updated. cf3fce9e08cf4b93426af14b8882d1ad1bc61996

[Michael J. Rubinsky]

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

from: c71d0087fadb452d0faabe72f8579ec9d1f7da5e

cf3fce9 Fix bad merge.

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

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

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

    Fix bad merge.

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

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