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

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

06177223e239959c01139012f227855d27b0c695