Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 6 Apr 2012 15:37:36 +0000 (17:37 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 6 Apr 2012 15:37:36 +0000 (17:37 +0200)
commit959a32be2ef15652d1be4113bb1b72af24ec030c
tree0953198de751eb84c24a6af149d2598c402e54a7
parent4fdc7029ccef0500fd8f968413c2b82db8fe2f29
parent5334b5b7a2cabb38106a47e7aa3310e98d2d381b
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel