From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 8 Nov 2016 18:54:14 +0000 (+0100)
Subject: Merge branch 'release-4.13'
X-Git-Tag: 4.14~104
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=462c7b35cf516826caffec89fe185d90438ae46e;p=i3%2Fi3

Merge branch 'release-4.13'
---

462c7b35cf516826caffec89fe185d90438ae46e