From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 1 Oct 2011 16:44:46 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~131
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0482dc754681eb8bf0c05ed46943b066813dae0c;p=i3%2Fi3

Merge branch 'master' into next
---

0482dc754681eb8bf0c05ed46943b066813dae0c