From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 10 Jul 2014 22:33:13 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~71
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c2ccfc7e6088153c3846ea6b525cd41a6606ae72;p=i3%2Fi3

Merge branch 'master' into next
---

c2ccfc7e6088153c3846ea6b525cd41a6606ae72