From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 8 Sep 2015 07:19:33 +0000 (+0200)
Subject: Merge branch 'release-4.10.4'
X-Git-Tag: 4.11~27^2
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=dbb34ade82e2f56ca98638f879c3a3c3240fc067

Merge branch 'release-4.10.4'
---

dbb34ade82e2f56ca98638f879c3a3c3240fc067