Merge branch 'stable-81x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-81x
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 20 Jul 2012 13:13:27 +0000 (15:13 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 20 Jul 2012 13:13:27 +0000 (15:13 +0200)
commit90e737b011a1acc785ea9018f3389a1ee10adbd6
tree305f95dabe7ea68a1689f6a68d89716bcc74a76d
parent5b5dbc0df55a4b4082ff819f3c20316d94936a7f
parenta8ce0eff2e9c97d6c0c878451f83a3759ec0d07f
Merge branch 'stable-81x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-81x