From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 20 Sep 2011 21:37:00 +0000 (+0100)
Subject: Merge branch 'fix-variables-cfg'
X-Git-Tag: 4.1~142^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=67aab7c8bd7bdb2bff5064b14efb1149d7995f55;p=i3%2Fi3

Merge branch 'fix-variables-cfg'
---

67aab7c8bd7bdb2bff5064b14efb1149d7995f55