Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 4 Jan 2012 08:00:42 +0000 (09:00 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 4 Jan 2012 08:00:42 +0000 (09:00 +0100)
commitde0c66402d252e10fbc3978b843ea1a991a8e92c
treece7ca4d441bc8b87d7ae3a454d3b8559d58057ca
parent36f92e6974f4c14c420042d115ff3686093c2e69
parentefccdcf4db04e63bfa3512c80215357ee9ffd98f
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel