From: Rudolf Polzer Date: Sat, 11 Sep 2010 00:04:45 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~41 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=45bc3de646e26999f08744aecd50ebd2a5bef698;p=xonotic%2Fxonotic.git Merge branch 'master' into divVerent/crypto2 --- 45bc3de646e26999f08744aecd50ebd2a5bef698