From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 21 Dec 2013 20:32:55 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.7~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b2c91f54abe6ab6af225dbdc987918c1f449dc0c;p=i3%2Fi3

Merge branch 'master' into next
---

b2c91f54abe6ab6af225dbdc987918c1f449dc0c