From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 1 Mar 2015 16:19:22 +0000 (+0100)
Subject: Merge branch 'defect-1480' of https://github.com/Airblader/i3-original into Airblader... 
X-Git-Tag: 4.10.1~82^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=91476e2c1107606d9ffe66f0d97975ff7a763058;p=i3%2Fi3

Merge branch 'defect-1480' of https://github.com/Airblader/i3-original into Airblader-defect-1480
---

91476e2c1107606d9ffe66f0d97975ff7a763058