From: Peje Nilsson <peje66@gmail.com>
Date: Thu, 15 Jun 2017 15:33:15 +0000 (+0200)
Subject: Merge branch 'master' into actions-arithmetic
X-Git-Tag: 1.1~294
X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=a86c67c2ab269eb638cbcb6029e6b07afd4824c9

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

a86c67c2ab269eb638cbcb6029e6b07afd4824c9