Merge branches 'master' and 'master' of http://nl.git.xonotic.org/xonotic/xonotic...
authorSamual Lenks <samual@xonotic.org>
Sat, 22 Sep 2012 20:57:51 +0000 (16:57 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 22 Sep 2012 20:57:51 +0000 (16:57 -0400)
commitaadf311efcedae28f1fb3b24a362ec72fcc1d875
tree7d68658be8c8256a92332fc328dccd3c35fd9cc2
parent393fe35ce6fc67d7721eff009d976c73aa6b799c
parentc768e79842a659a99fe795822f3a8cd8bd235ff4
Merge branches 'master' and 'master' of nl.git.xonotic.org/xonotic/xonotic-data.pk3dir