Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 24 Apr 2012 18:27:06 +0000 (20:27 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 24 Apr 2012 18:27:06 +0000 (20:27 +0200)
commit94ef7564c4585129c6025debe797c8dade2e6885
tree1d47e1d4281e7e35012824cc5f0c91e840484082
parentd7e16fba696d75111a03e335c98219e4ad3b5704
parent0e825f80816d1166a72cee722663a9a2d3c16782
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel