From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 20 Sep 2012 09:20:00 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.4~154
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f039a0ded4c5d79a1abd4b882928b625feabc811;p=i3%2Fi3

Merge branch 'master' into next
---

f039a0ded4c5d79a1abd4b882928b625feabc811