From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 11 Sep 2011 22:42:12 +0000 (+0100)
Subject: Merge branch 'fix-reload-assignments' into next
X-Git-Tag: 4.1~161
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=355082a74cfebb4f197fc4edb0571620349310f9;p=i3%2Fi3

Merge branch 'fix-reload-assignments' into next
---

355082a74cfebb4f197fc4edb0571620349310f9