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

Merge branch 'master' into next
---

c23db20cb56847305bd8b6b362b8623e9e81db69