From: Samual <samual@xonotic.org>
Date: Wed, 18 Jan 2012 16:18:27 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/menu_updates
X-Git-Tag: xonotic-v0.6.0~139
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b73f381ebb0443f7b59bdef2a0934dfdc900e0a0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/menu_updates

Conflicts:
	qcsrc/menu/xonotic/dialog_settings_network.c
---

b73f381ebb0443f7b59bdef2a0934dfdc900e0a0