]> code.citadel.org Git - citadel.git/commitdiff
fix some conflicts that for some reason weren't resolved during the last cherry-picks
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 26 Feb 2013 18:52:49 +0000 (19:52 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 26 Feb 2013 18:52:49 +0000 (19:52 +0100)

No differences found