From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 18 Dec 2011 17:25:15 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~176
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=c4298b9311ecbf7921c21d15b34f96c9af929bc3

Merge branch 'master' into next
---

c4298b9311ecbf7921c21d15b34f96c9af929bc3