From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 16 Aug 2011 23:52:45 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~221
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2abe23d6ff8179b0d047a0bcdeff9c6b75bd89da;p=i3%2Fi3

Merge branch 'master' into next
---

2abe23d6ff8179b0d047a0bcdeff9c6b75bd89da