From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 15 Jul 2014 08:28:51 +0000 (+0200)
Subject: Merge branch 'fix-layout-output'
X-Git-Tag: 4.9~67^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9463be42b84b2d87b470e0ef5ccf3d24114e791a;p=i3%2Fi3

Merge branch 'fix-layout-output'
---

9463be42b84b2d87b470e0ef5ccf3d24114e791a