From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 23 Jan 2014 22:05:15 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.8~135
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=00cf2b21daa5bd5973f52cb1ac7a3852bf69f7cc;p=i3%2Fi3

Merge branch 'master' into next
---

00cf2b21daa5bd5973f52cb1ac7a3852bf69f7cc