From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 31 Jan 2015 21:42:54 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dd5be77d1dcc7e7eb40ce1c33f985816fc0b8f79;p=i3%2Fi3

Merge branch 'master' into next
---

dd5be77d1dcc7e7eb40ce1c33f985816fc0b8f79