Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 5 Oct 2013 03:40:30 +0000 (05:40 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 5 Oct 2013 03:40:30 +0000 (05:40 +0200)
commit4e9952daf6d736348f34fa1e02f33a568d25d894
tree6445f86a4dd7e8814deaa3e75c3989778c62eee0
parentab472129567331427686fd2dc4dacf61afe58ff9
parent6fcf52d210b8b1da3652f2e3384f67989b247e33
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel