Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 3 Aug 2013 14:20:51 +0000 (16:20 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 3 Aug 2013 14:20:51 +0000 (16:20 +0200)
commitc6579e9bf76c520390532dd3866839ca13d61b70
treebc9e83d3b946e7078baab19d006aed4dbe11e81b
parent8e60f37d49c1718c0cb374c1b8d309286f6a5935
parent998e8e43701e080f3ef9d6849715e9a6f1616255
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel