From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 29 Jun 2013 18:58:51 +0000 (+0200)
Subject: Merge branch 'fix-whitespace'
X-Git-Tag: 4.6~11^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=73508dec0cd33f7c19f04472b1712cd6a1a4f6dd;p=i3%2Fi3

Merge branch 'fix-whitespace'
---

73508dec0cd33f7c19f04472b1712cd6a1a4f6dd