Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@uncensored.citadel.org>
Wed, 18 May 2011 01:34:59 +0000 (03:34 +0200)
committerthe_mgt <themgt@uncensored.citadel.org>
Wed, 18 May 2011 01:34:59 +0000 (03:34 +0200)
commit1a141b0afaa73ed3b83895c2993a536a3133b4cf
treedcc234fefff64b1b519c15ccb8508ca54b173847
parentf4ce4740186a1b1051f4cbd56263e68fb3e3ee08
parente92359c9c0795d4f13c129068fb32b12b9ae7c36
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel