Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 30 Jul 2011 17:59:49 +0000 (17:59 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 30 Jul 2011 17:59:49 +0000 (17:59 +0000)
commit8df0d37074447149a15e06a57e0fe8baa3ff67f8
treecf0033db2a19d4d200c2806a37883ea86e9afb43
parent8539ed17466b253e39c573a97bb5a2c72f8abf3b
parent244384e164e73b0d3201540cdcc322c281c012ad
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel