Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 6 Apr 2012 21:20:29 +0000 (23:20 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 6 Apr 2012 21:20:29 +0000 (23:20 +0200)
commit5922d6ab5d9d36dafabcf0c5a01499be0f9d2f42
treec3edd7706ce34cce6b99ca4608dfa5f8106a4e38
parent91a9b8806b53105a54a4bc83bb40d68b5d6f0b6d
parent8b205c8685728911def335ced64f35b5be86e7f5
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel