Merge branch 'master' into terencehill/weapon_panel_fix
authorterencehill <piuntn@gmail.com>
Sun, 1 Feb 2015 13:09:39 +0000 (14:09 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 1 Feb 2015 13:09:39 +0000 (14:09 +0100)

Trivial merge