From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 4 Aug 2011 20:21:27 +0000 (+0200)
Subject: Merge branch 'fix-stacking'
X-Git-Tag: 4.0.2~56
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=93f475778f22dabdaa7b1fd318ca0c0b393b74a8;p=i3%2Fi3

Merge branch 'fix-stacking'
---

93f475778f22dabdaa7b1fd318ca0c0b393b74a8