From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 22 Aug 2011 10:44:58 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~212
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cc2ca32b13d15125a4a7f83ddf1af2b55b4bbb13;p=i3%2Fi3

Merge branch 'master' into next
---

cc2ca32b13d15125a4a7f83ddf1af2b55b4bbb13