Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 24 Nov 2011 21:57:19 +0000 (22:57 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 24 Nov 2011 21:57:19 +0000 (22:57 +0100)
commitc6ccfb9bc8edb05fdbbccbcc7b0fbc621e287d0b
tree00f45a78b076129ea6c65ace435b11f767b9199e
parentfa8f7ffba529da2235c4da391fb2047025befed7
parent499731379bfe6aa7e2ae600adce41efbb705ede5
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel