From: BuddyFriendGuy <bfggeneral@gmail.com>
Date: Fri, 10 Apr 2015 04:13:10 +0000 (-0400)
Subject: Merge branch 'master' into BuddyFriendGuy/mapStringFilter
X-Git-Tag: xonotic-v0.8.1~23^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0561d8c4a32b79f3d19e1af7716f6a49d297825e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into BuddyFriendGuy/mapStringFilter
---

0561d8c4a32b79f3d19e1af7716f6a49d297825e