From: Timo Korvola <tkorvola@iki.fi>
Date: Wed, 24 Jan 2018 22:05:42 +0000 (+0200)
Subject: Merge branch 'master' into resize
X-Git-Url: https://scope-eye.net/git/?a=commitdiff_plain;h=2521106c0dccff5f1f6e19105ab8e432ab74a378;p=liskon_frotz.git

Merge branch 'master' into resize
---

2521106c0dccff5f1f6e19105ab8e432ab74a378