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)
commit48d1f8bb18b98e6b56eb6377b88e84bd89d7382c
treedcc234fefff64b1b519c15ccb8508ca54b173847
parentdf7a47ed58b0764292926d376a44f96f6c7f8d92
parent5b4067970112619bece065248c43aa6462736517
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel