Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 22 Feb 2013 11:41:15 +0000 (12:41 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 22 Feb 2013 11:41:15 +0000 (12:41 +0100)
commitff7f36e7a7ad88d75d1201a78cb60dc6b2cce299
treec8328c1221d9136a1ca080b7a746e70b167b72e4
parent7389885c5aa497ec0f3332a5a04f305a4e56ed06
parentc4697d58bd65e7118ba7a3775e1a4d9b4cf941cc
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel