From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 27 Nov 2011 21:44:25 +0000 (+0000)
Subject: Merge branch 'fix-whitespace'
X-Git-Tag: 4.1.1~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dd63495ce014885b1e098e56d65c2a71d6d5a5b7;p=i3%2Fi3

Merge branch 'fix-whitespace'
---

dd63495ce014885b1e098e56d65c2a71d6d5a5b7