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

Merge branch 'master' into next
---

9cec9e09ed0d74c037018c30e8b25a27559baba7