Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 20 Jan 2012 20:23:40 +0000 (21:23 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 20 Jan 2012 20:23:40 +0000 (21:23 +0100)
commit475c21c8532b6ba682535c2b2e19a1427040a669
tree895b643c7a0db6aea616cd7d2054e0e2233714e5
parent169ffd2ba4faf7a2aa047add309450ff8502b82c
parent5ba959c18fdff446e9f54b3062c74e94bbf58b47
Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel