From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 13:47:31 +0000 (+0200)
Subject: Merge branch 'fix-floatdock'
X-Git-Tag: 4.0.2~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c96b5a12a7894714308fcddec4023726438d1b34;p=i3%2Fi3

Merge branch 'fix-floatdock'
---

c96b5a12a7894714308fcddec4023726438d1b34