Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 28 Feb 2012 20:49:14 +0000 (21:49 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 28 Feb 2012 20:49:14 +0000 (21:49 +0100)
commit613695503cbe31ab6f9780b11ba4ea74885f7b15
tree450fdcacd37174b6e5a3d4fd169a65660ef44eb0
parent5908cd95dd4b42dbc40fc80ae0e1cf453c5dc68b
parent51f4a1b3c13bf039d2eac1c62b4e41c45f4c56a3
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel