Merge remote-tracking branch 'origin/Mirio/mapinfos', fixes #1764
authorRudolf Polzer <divverent@xonotic.org>
Fri, 11 Oct 2013 14:48:06 +0000 (16:48 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 11 Oct 2013 14:48:06 +0000 (16:48 +0200)
commit0e0de51fcadb508f7c1adeb91658fe174aff9bcf
tree90eadb6058489d04672474caab7e26f76821c8a4
parentbd4eebf3a7acdb1f889fb9905175b984201b8008
parent59fd9064c6ffdb2a8aca8b06aaa6d7fd7d0e4a4b
Merge remote-tracking branch 'origin/Mirio/mapinfos', fixes #1764

* origin/Mirio/mapinfos:
  Remove rune from two mapinfos