From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 26 Nov 2011 21:19:30 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~220
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=555dd48f09a1aceb7429a5c575b0e64070e923e4

Merge branch 'master' into next
---

555dd48f09a1aceb7429a5c575b0e64070e923e4