From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 8 Aug 2014 18:16:40 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~59
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=89d3f93bec03547cf5b07b1e120aa07374b2dd64

Merge branch 'master' into next
---

89d3f93bec03547cf5b07b1e120aa07374b2dd64