From: terencehill <piuntn@gmail.com>
Date: Thu, 23 Jun 2016 16:58:13 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/infomessages_panel_update
X-Git-Tag: xonotic-v0.8.2~758^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fc15d72b041c9a748b605ba28735380fbe5b5b01;p=xonotic%2Fxonotic-data.pk3dir.git

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

fc15d72b041c9a748b605ba28735380fbe5b5b01