Merge branch 'master' into terencehill/music_player
authorterencehill <piuntn@gmail.com>
Tue, 30 Dec 2014 23:42:33 +0000 (00:42 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 30 Dec 2014 23:42:33 +0000 (00:42 +0100)
1  2 
defaultXonotic.cfg

Simple merge