[commits] Horde branch kronolith_4_2 updated. d97eb2bfff87f14872d5f3ccf5a1be7a54ab55a8

[Jan Schneider]

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

from: 03441cbaf56b5fb42cc0768d987c810de24b15c2

d97eb2b Fix merge conflicts.

Summary: http://github.com/horde/horde/compare/03441cbaf56b5fb42cc0768d987c810de24b15c2...d97eb2bfff87f14872d5f3ccf5a1be7a54ab55a8

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

commit d97eb2bfff87f14872d5f3ccf5a1be7a54ab55a8
Author: Jan Schneider <jan at horde.org>
Date:   Mon Oct 14 11:54:58 2013 +0200

    Fix merge conflicts.

 kronolith/package.xml |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

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