From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 7 Mar 2015 14:40:59 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.10.1~76
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=6226400dfd19fb67f165ae543d1ceaa2d33008cc

Merge branch 'master' into next
---

6226400dfd19fb67f165ae543d1ceaa2d33008cc