From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 27 Jun 2014 07:05:32 +0000 (+0200)
Subject: Merge branch 'fix-restart'
X-Git-Tag: 4.9~84^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3b546d00f76647e50c6e3c3744ab5a4f30e7a698;p=i3%2Fi3

Merge branch 'fix-restart'
---

3b546d00f76647e50c6e3c3744ab5a4f30e7a698