From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 21 Mar 2012 19:24:03 +0000 (+0100)
Subject: Merge branch 'fix-floating-restart'
X-Git-Tag: 4.2~49^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7997fd667be5ed6fa41775418685c5a062809f60;p=i3%2Fi3

Merge branch 'fix-floating-restart'
---

7997fd667be5ed6fa41775418685c5a062809f60