Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 14 Jun 2012 22:06:26 +0000 (00:06 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 14 Jun 2012 22:06:26 +0000 (00:06 +0200)
commitc1a1720bef64ec79d3b949d9f757b78462071bb5
tree2e1b393d6e9e7806d897c4b54d86a38d08cb63c4
parent3bfb4bf4a7732b175a4f6734e93007794240c256
parent20bfbcce87d19ffabe2e7af24277fee46717ac54
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel