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

Merge branch 'master' into next
---

57e7266da4d5576878375a722f0f186e70fc2ee3