From: Timo Korvola <tkorvola@iki.fi>
Date: Sat, 10 Feb 2018 12:57:04 +0000 (+0200)
Subject: Merge branch 'master' into resize
X-Git-Url: https://scope-eye.net/git/?a=commitdiff_plain;h=18597db3b0d2f0ac66066f988d62433839de502b;p=liskon_frotz.git

Merge branch 'master' into resize
---

18597db3b0d2f0ac66066f988d62433839de502b