From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 8 Mar 2014 19:59:18 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.8~107
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=b28ddca96d58689e50becd33de8a4031f520befd

Merge branch 'master' into next
---

b28ddca96d58689e50becd33de8a4031f520befd