From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 22 Apr 2012 18:11:25 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=54222d56172fa014f4bed262b8efd06694a839e9;p=i3%2Fi3

Merge branch 'master' into next
---

54222d56172fa014f4bed262b8efd06694a839e9