From: Samual Lenks Date: Tue, 15 Jan 2013 03:11: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~310 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=fdbb1364d05c525c5dfc178b10baf435fd00840c Merge remote-tracking branch 'origin/master' into samual/notification_rewrite --- fdbb1364d05c525c5dfc178b10baf435fd00840c