From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 21 Jan 2012 14:21:34 +0000 (+0000)
Subject: Merge branch 'fix-floating-pos'
X-Git-Tag: 4.1.2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cccf078f1e0ce0d8c91795809293c4c259754073;p=i3%2Fi3

Merge branch 'fix-floating-pos'
---

cccf078f1e0ce0d8c91795809293c4c259754073