Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 30 Jun 2011 21:13:10 +0000 (21:13 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 30 Jun 2011 21:13:10 +0000 (21:13 +0000)
commitb6292366a603fa89e22afcce4c3d4a7f5bafc268
treeddd16fa582de17e320e56275a771a8fdbcba08e8
parentdb483f6909c7371d06cdabf807de235880fd334c
parent850f3b45ceade4771d0ad0bb7f2c59cfb12b5a07
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel