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

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

c84d37091899d4bfcd747dd4afd182d81c3720b3