]> code.citadel.org Git - citadel.git/commitdiff
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 3 Apr 2011 21:49:18 +0000 (23:49 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 3 Apr 2011 21:49:18 +0000 (23:49 +0200)

Trivial merge