From: terencehill <piuntn@gmail.com>
Date: Mon, 2 Sep 2013 10:30:57 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/welcome_dialog
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=424e81ad9e5fa9d924ea1165a4931c28a25cbd3f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/welcome_dialog
---

424e81ad9e5fa9d924ea1165a4931c28a25cbd3f