From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 10 Nov 2012 08:01:24 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.4~37
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=dece12bf1857ac2384e2da8917f65f2dfe3f2b37

Merge branch 'master' into next
---

dece12bf1857ac2384e2da8917f65f2dfe3f2b37