From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 27 Nov 2011 21:44:28 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~212
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=356d80c15b880081a518aaa87a2531ff864b1404

Merge branch 'master' into next
---

356d80c15b880081a518aaa87a2531ff864b1404