From: Peje Nilsson <peje66@gmail.com>
Date: Mon, 19 Jun 2017 22:06:49 +0000 (+0200)
Subject: Merge branch 'master' into magic-number
X-Git-Tag: 1.1~204
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=4b93fb327a0ae07cf931f0ebc4c9a946e4cafd6c;hp=4b93fb327a0ae07cf931f0ebc4c9a946e4cafd6c;p=open-adventure.git

Merge branch 'master' into magic-number
---