From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 1 Jan 2014 10:10:26 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.8~175
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=67b213665b7f4dc5302c5f39bf0c761c3e762fc3;p=i3%2Fi3

Merge branch 'master' into next
---

67b213665b7f4dc5302c5f39bf0c761c3e762fc3