From: Samual Lenks <samual@xonotic.org>
Date: Fri, 8 Feb 2013 02:21:08 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~265
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cfc97de2f89e06a0dd538202d4073c4aed16173e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
---

cfc97de2f89e06a0dd538202d4073c4aed16173e