From: Tomas Wenström <tomas.wenstrom@gmail.com>
Date: Sun, 5 Nov 2017 19:00:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://dolda2000.com/gitweb/?p=kaka%2Fcakelight.git;a=commitdiff_plain;h=e9e4a88732e23b350bb8d2a98a662cbca850cd47

Merge remote-tracking branch 'origin/master'
---

e9e4a88732e23b350bb8d2a98a662cbca850cd47