Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 29 Jan 2013 23:24:21 +0000 (00:24 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 29 Jan 2013 23:24:21 +0000 (00:24 +0100)
commit6f0f2b51a2ccb6873d3b2c8ecb075535d2516729
tree7f0f28cc73862f1988f61fb987fd47aa861a876f
parent17daa21763656d90d71305016470db47de7f5cfe
parent4b63e0f03d379a35f20262f10b2f6b29d0d81ffc
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel