From: Samual Lenks Date: Fri, 28 Dec 2012 00:23:34 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into samual/notification_rewrite X-Git-Tag: xonotic-v0.7.0~62^2~23^2~316 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6fdab86857d5334d84a3720ec28d863d9da1544a Merge remote-tracking branch 'origin/master' into samual/notification_rewrite --- 6fdab86857d5334d84a3720ec28d863d9da1544a