From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 May 2012 15:27:22 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~222
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0618ef649ec182ed00f3249e7410b5c7fe780860;p=i3%2Fi3

Merge branch 'master' into next
---

0618ef649ec182ed00f3249e7410b5c7fe780860