Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 2 Mar 2017 13:03:00 +0000 (14:03 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 2 Mar 2017 13:03:00 +0000 (14:03 +0100)
commit106abc532845a0706845249ea4a3b66c068e2ebb
tree9372da01157c9fe7620bd3d48b26222d6279874b
parentc250c0167066c9f920d0083d2bda2cfdf0990e94
parent471d46bd6a3558c4cee1d470b35e290e9b425cb0
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki