[commits] Horde branch master updated. 3ebd39035156f9e67acd1906585650aba012d844

[Jan Schneider]

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

from: e0f342c372096033880dc4b06eadbce582051339

3ebd390 Fix conflict.

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

commit 3ebd39035156f9e67acd1906585650aba012d844
Author: Jan Schneider <jan at horde.org>
Date:   Wed May 4 22:57:50 2011 +0200

    Fix conflict.

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

http://git.horde.org/horde-git/-/commit/3ebd39035156f9e67acd1906585650aba012d844