From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 3 Aug 2011 18:49:01 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~246
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4c3a8957eec8662cbce68673abbe31d23475fca9;p=i3%2Fi3

Merge branch 'master' into next
---

4c3a8957eec8662cbce68673abbe31d23475fca9