From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 15 Jul 2014 08:28:51 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~67
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ee7582169944e601b54a24ee30b634a8824b6571;p=i3%2Fi3

Merge branch 'master' into next
---

ee7582169944e601b54a24ee30b634a8824b6571