From: terencehill <piuntn@gmail.com>
Date: Mon, 24 Jan 2011 21:01:25 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/menu_dialogs_cleanups
X-Git-Tag: xonotic-v0.5.0~316^2~2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9025619c550b721820b0fd231f662a68cc398478;p=xonotic%2Fxonotic-data.pk3dir.git

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

9025619c550b721820b0fd231f662a68cc398478