Merge branch 'stable-81x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-81x
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 20 Jul 2012 14:47:47 +0000 (16:47 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 20 Jul 2012 14:47:47 +0000 (16:47 +0200)
commit3d79b0d1274ade1997a12b6e27ac581ae900fc38
tree2279d4a730923277971a1a535c0e7eff722d3e1a
parentfdfbdd308b8593fd0073a4104e88651298d87bf9
parent53481be28de6082a8f59dad096ff7df7601fa1a7
Merge branch 'stable-81x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-81x