From: Jonathan Amery <jdamery+zgit@ysolde.ucam.org>
Date: Sat, 12 Sep 2015 16:24:48 +0000 (+0100)
Subject: Merge branch 'master' of /home/wiki/playersguide/PlayersGuide
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~nmamery/git?a=commitdiff_plain;h=6c6c994a6e80c3ee1b948d2e7e99cd99aed8c578;p=PlayersGuide.git

Merge branch 'master' of /home/wiki/playersguide/PlayersGuide
---

6c6c994a6e80c3ee1b948d2e7e99cd99aed8c578