From: Peje Nilsson <peje66@gmail.com>
Date: Fri, 16 Jun 2017 08:10:38 +0000 (+0200)
Subject: Merge branch 'master' into actions-arithmetic
X-Git-Tag: 1.1~290
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;ds=inline;h=d4fc7a88b4aac2f72013e7c681c907de09db349d;p=open-adventure.git

Merge branch 'master' into actions-arithmetic
---

d4fc7a88b4aac2f72013e7c681c907de09db349d