From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 Sep 2015 06:55:24 +0000 (+0200)
Subject: Merge branch 'release-4.11'
X-Git-Tag: 4.12~153
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=91e7756e435fb3249ab3bf0f7480b5178ebc00c8;p=i3%2Fi3

Merge branch 'release-4.11'
---

91e7756e435fb3249ab3bf0f7480b5178ebc00c8