From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 30 Jul 2015 20:27:15 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.11~66
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=2bde6f080ecd5d0e2dccb20a1936a5d40af7ff84

Merge branch 'master' into next
---

2bde6f080ecd5d0e2dccb20a1936a5d40af7ff84