Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 30 Jan 2012 23:53:13 +0000 (00:53 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 30 Jan 2012 23:53:13 +0000 (00:53 +0100)
commitd04e4ad0b8ab9e5b71310030704d61b6eceb530b
tree0399d1597b928793e091ffcda58f00457d2b4675
parenta2c82b9c528f42245015edacdc2670f5f7252b00
parentd3a29d82d6492191ae8208617e8ac1f088bcf14a
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel