From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 9 Aug 2011 07:28:06 +0000 (+0200)
Subject: Merge branch 'get-marks' into next
X-Git-Tag: 4.1~230
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eb0a56fad1a9048e3905972f5db0d61c5bd13516;p=i3%2Fi3

Merge branch 'get-marks' into next
---

eb0a56fad1a9048e3905972f5db0d61c5bd13516