From: Jan D. Behrens Date: Thu, 20 Sep 2012 17:43:15 +0000 (+0200) Subject: Merge branch 'pickupbot' into approved X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=249af7a8eb1687c6d01c583dab1debdf8ba9e6f5;p=xonotic%2Fxonstat.git Merge branch 'pickupbot' into approved --- 249af7a8eb1687c6d01c583dab1debdf8ba9e6f5