From: Wilfried Goesgens <dothebart@citadel.org>
Date: Fri, 1 Oct 2010 05:50:57 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/psy-q/citadel
X-Git-Tag: v8.01~682
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=61ca58006dc3cc711314b1c8c284612b52bb465c;hp=-c;p=citadel.git

Merge branch 'master' of git://github.com/psy-q/citadel
---

61ca58006dc3cc711314b1c8c284612b52bb465c