Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 2 Jul 2012 23:00:53 +0000 (01:00 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 2 Jul 2012 23:00:53 +0000 (01:00 +0200)
commitcd367fad021ddbae6f6977a4eb80e426da39248d
tree83a34e2cc39d5ecc1cea251361f13234f7568ee7
parent50a7f9b7c2183eb912b5c22d8f70b82a8310a6c6
parentdb43da95b465822391650fb0ddbd94aecdc6a6f0
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel