From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 7 Mar 2015 13:52:39 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.10.1~77
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a2a32ab1ee04c0d29217b6e8b51897140e09239c;p=i3%2Fi3

Merge branch 'master' into next
---

a2a32ab1ee04c0d29217b6e8b51897140e09239c