From: Wim Vanderbauwhede <wim.vanderbauwhede@mail.be>
Date: Thu, 14 Feb 2019 16:41:40 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into patch-image-description
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=04b1c135543965860029557fc216eb38fd63b6c7;p=akkoma

Merge remote-tracking branch 'upstream/develop' into patch-image-description
---

04b1c135543965860029557fc216eb38fd63b6c7