From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 27 Jun 2012 15:49:19 +0000 (+0200)
Subject: Merge branch 'fix-reload'
X-Git-Tag: 4.3~199^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3fe3fdd2f99bfce76374567016231d5f66e235a3;p=i3%2Fi3

Merge branch 'fix-reload'
---

3fe3fdd2f99bfce76374567016231d5f66e235a3