From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 4 Jan 2014 11:23:06 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.8~168
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2314f107784196d8fc7ee500645dbdf548f91386;p=i3%2Fi3

Merge branch 'master' into next
---

2314f107784196d8fc7ee500645dbdf548f91386