From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 14 Sep 2011 21:59:59 +0000 (+0100)
Subject: Merge branch 'fix-floating-confreq'
X-Git-Tag: 4.1~160^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1e18952d092620e84130712cc0620b518865d08e;p=i3%2Fi3

Merge branch 'fix-floating-confreq'
---

1e18952d092620e84130712cc0620b518865d08e