From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 17 Dec 2011 14:22:31 +0000 (+0000)
Subject: Merge branch 'fix-mark'
X-Git-Tag: 4.1.1~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6694a201eb50a8093b5e71a616793b133e3f1313;p=i3%2Fi3

Merge branch 'fix-mark'
---

6694a201eb50a8093b5e71a616793b133e3f1313