From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 3 Aug 2011 18:48:57 +0000 (+0200)
Subject: Merge branch 'doc-floating'
X-Git-Tag: 4.0.2~61
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d0f1d8aa71371e5c952547580dd99650b065a480;p=i3%2Fi3

Merge branch 'doc-floating'
---

d0f1d8aa71371e5c952547580dd99650b065a480