From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 1 Sep 2013 11:35:19 +0000 (+0200)
Subject: Merge branch 'fix-flattening'
X-Git-Tag: 4.7~64^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0fbc40ff5fb61b692abdfaf657b0632c979b7997;p=i3%2Fi3

Merge branch 'fix-flattening'
---

0fbc40ff5fb61b692abdfaf657b0632c979b7997