From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 21 Mar 2012 20:41:13 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~47
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=36fdab7b6ae4ef1eb45519145fdb5de5a60ba2ed

Merge branch 'master' into next
---

36fdab7b6ae4ef1eb45519145fdb5de5a60ba2ed