From: Jonathan Amery <jdamery+zgit@ysolde.ucam.org>
Date: Tue, 30 Aug 2016 00:25:39 +0000 (+0100)
Subject: Merge branch 'master' of /home/wiki/playersguide/PlayersGuide
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~jdamery/git?p=PlayersGuide.git;a=commitdiff_plain;h=df1ca4b1b2bcfc9e6f1b910d1267c49d375bf4ad

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

df1ca4b1b2bcfc9e6f1b910d1267c49d375bf4ad