From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 4 Aug 2011 21:37:34 +0000 (+0200)
Subject: Merge branch 'fix-restart'
X-Git-Tag: 4.0.2~55
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d4f32382c9b1790c8059371b72e3d2645985496e;p=i3%2Fi3

Merge branch 'fix-restart'
---

d4f32382c9b1790c8059371b72e3d2645985496e