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

Merge branch 'master' into next
---

cc09348414472e68287ab918df57158552146f72