From: Niki Roo <niki@nikiroo.be>
Date: Sat, 13 Apr 2019 06:40:43 +0000 (+0200)
Subject: Merge branch 'master' into search
X-Git-Tag: fanfix-swing-0.0.1~12^2~164
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=b3173d5afede84d43bb8df46a5fd132db7ad5009;p=fanfix-swing.git

Merge branch 'master' into search
---

b3173d5afede84d43bb8df46a5fd132db7ad5009