]> code.citadel.org Git - citadel.git/commitdiff
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 21 Aug 2012 22:13:45 +0000 (00:13 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 21 Aug 2012 22:13:45 +0000 (00:13 +0200)

Trivial merge