From: Samual Lenks <samual@xonotic.org>
Date: Tue, 5 Mar 2013 00:47:19 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/samual/notification_rewrite'
X-Git-Tag: xonotic-v0.7.0~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f597393bef6f0a0a60e2969c9b9a637391f4233d;p=xonotic%2Fxonotic.git

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

f597393bef6f0a0a60e2969c9b9a637391f4233d