Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 14 Jan 2012 15:51:47 +0000 (16:51 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 14 Jan 2012 15:51:47 +0000 (16:51 +0100)
commite513f41d4e9fe894313bb9c7f8dc9938fc6db2c9
treeccb6ea87d619278c0bc4cd6a52f96c78ad551b24
parent7ba7f73f95cad7f4ecd7f986e12095e9bb546126
parent57b37d4ed168b176d594bc149e5d16a1b9f0517a
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel