Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 12 May 2011 19:53:43 +0000 (19:53 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 12 May 2011 19:53:43 +0000 (19:53 +0000)
commitfe1aa0ac63d5dc1b233888196500bbcbfdb2fb17
treeb3f0e4b6de062bf5eb938de10255b81a326cee36
parentd0099e1efda7d76841bc279b219dd53c23294206
parenta7419fabde1ce4a33de01232519f639fa9d76b23
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel