From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 27 Aug 2011 11:47:57 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~186
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=8114ecda478a39c787510bbe6d63f7d19f635da6

Merge branch 'master' into next
---

8114ecda478a39c787510bbe6d63f7d19f635da6