Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 29 Apr 2012 10:14:09 +0000 (12:14 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 29 Apr 2012 10:14:09 +0000 (12:14 +0200)
commitc064b240ff457c4bcdc119aaf7a6a09ff31952e2
treee00d38bce6c35e9b1d9c930d6d9e4d6cafadb287
parentb5d9a5debc8a174d269a5bb5d2e63df836ef397a
parentfde1737f07b2161c11d7d091dc14d8a4eada9fdb
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel