Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 20 Oct 2014 19:15:10 +0000 (21:15 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 20 Oct 2014 19:15:10 +0000 (21:15 +0200)
commitada8144bf852768101effe5657d13c36b1ed1f6f
tree233a1d48066432326b1c870e558e906e858f30eb
parentd4cb5c8734129f39c1e79f3a93d9cfc7db5ae058
parent5ec417e35ec1eb0b1b0ed055157177d9a2163d61
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel