From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 23 Jan 2014 21:20:16 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.8~138
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=cacc199a6837868a67c4f546df5bd32972d6cc5c

Merge branch 'master' into next
---

cacc199a6837868a67c4f546df5bd32972d6cc5c