From: Paul Scott <poogascott@gmail.com>
Date: Sat, 4 Jun 2011 07:42:09 +0000 (+1000)
Subject: Merge branch 'master' into pooga/keepawaybots
X-Git-Tag: xonotic-v0.5.0~199^2~14^2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=04367582aa7c38c7c624ef4dff508933248e48a5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into pooga/keepawaybots
---

04367582aa7c38c7c624ef4dff508933248e48a5