From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 13:47:35 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~182
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=16188af8bf24ecdd82c36ba41524a5c02fba97a6;p=i3%2Fi3

Merge branch 'master' into next
---

16188af8bf24ecdd82c36ba41524a5c02fba97a6