Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 24 Jul 2011 15:54:24 +0000 (15:54 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 24 Jul 2011 15:54:24 +0000 (15:54 +0000)
commitee6d156f84e201b99c0557689389f9ae068647e6
treebfc4b513fb86a00b2e1dd4d148abc82bc70e544c
parentfbcb12b0861ff4cc409ff5adac5cae036b4f62f8
parentb3b3e73feb285cfdca6e469ca151a70502f9e936
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel