From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 11 Jul 2014 07:51:28 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~69
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c937f768f92b74dfa662b174cf6e6fc6f4871234;p=i3%2Fi3

Merge branch 'master' into next
---

c937f768f92b74dfa662b174cf6e6fc6f4871234