Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 26 Nov 2012 23:33:51 +0000 (00:33 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 26 Nov 2012 23:33:51 +0000 (00:33 +0100)
commitb42480fc7900ffa7af50090b051d9c6359ad54ec
treea6776e952a7c6666e47c98f99ab543d4600f1ea6
parent7e112db8c786fdafc2a04dae09011038f1ceed10
parentcbefcb9d9b85519fd1b098f622255ea318e78fd7
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel