From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 2 Oct 2011 11:57:27 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~130
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=3537f2d4ca6ef2447a92f222d3458d4e27899661

Merge branch 'master' into next
---

3537f2d4ca6ef2447a92f222d3458d4e27899661