From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 08:34:30 +0000 (+0000)
Subject: Merge branch 'nyov/wiki' into 'master'
X-Git-Tag: xonotic-v0.8.0~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e81fb5aafb41d70897cafab7dcd5ceae17d13160;p=xonotic%2Fxonotic.git

Merge branch 'nyov/wiki' into 'master'

gitignore new wiki repo

I'm sorry I forgot this in the original commit.

See merge request !5
---

e81fb5aafb41d70897cafab7dcd5ceae17d13160