From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 26 Nov 2011 21:30:40 +0000 (+0000)
Subject: Merge branch 'fix-comment'
X-Git-Tag: 4.1.1~29
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=629ac57efbe3a5b7d412518d19f80de5daac2409;p=i3%2Fi3

Merge branch 'fix-comment'
---

629ac57efbe3a5b7d412518d19f80de5daac2409