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

Merge branch 'master' into next
---

6037050015dc2204c14fbd6b3d048c96ae159ef7