Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 3 Jul 2011 23:09:28 +0000 (23:09 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 3 Jul 2011 23:09:28 +0000 (23:09 +0000)
commit8052c90adb67d54b967309060fbaa6b47e89ac2f
treeaef7ad8b04b0c8d8a4d9ed733cf84df3aee3699d
parent5a13bb8d9b9681da52416a95b1a2166983882c24
parentb090fd872d5f4d16888cd0cf592993a2ce327465
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel