Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 28 Nov 2011 23:17:05 +0000 (00:17 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 28 Nov 2011 23:17:05 +0000 (00:17 +0100)
commit079fa3519c7d719f19dbec9fea6bec1da41ce742
tree7cae7c46b2073bf529fdc10faf650fcdd3fe3d3f
parent754036d82eb9c8a85c33deb536f5d252a77c06aa
parentd957ee1589a7f722f5fe82293c97aaa3bade59e7
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel