Merge branch 'master' of git://github.com/psy-q/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 1 Oct 2010 05:50:57 +0000 (07:50 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 1 Oct 2010 05:50:57 +0000 (07:50 +0200)

Trivial merge