Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 20 Oct 2013 16:53:48 +0000 (18:53 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 20 Oct 2013 16:53:48 +0000 (18:53 +0200)
commit393722da95dbd2ac9d38a99a4973458d97a7c5c7
tree094d212326b1712a475833b28dea99174b3bb4fd
parent4dbebf43e253a06ad0185d5312308ae036bdeccd
parent665261416e7aced7e85fa0f297c7781094d89174
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel