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

Merge branch 'master' into next
---

06ef7f72e4d7797c71cf07758fd72c0edad68296