Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 5 Jun 2012 18:54:35 +0000 (20:54 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 5 Jun 2012 18:54:35 +0000 (20:54 +0200)
commit506939fef3f2a43cae13ed7ca5e98b3076534c83
tree2a813e1dfa3edfd60a61250d07708a309da1bd30
parent6a4bea3fc0749145f3fc2fad514a5c4301f9d718
parent34b233c38837e3af994290d83231fb1268f26f1c
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel