From: Daniel Carl <danielcarl@gmx.de>
Date: Thu, 16 Jan 2014 21:22:51 +0000 (+0100)
Subject: Merge branch 'feature/marks'
X-Git-Url: https://git.owens.tech/assets/me.jpg/assets/me.jpg/git?a=commitdiff_plain;h=9a52b344f61309b64a19e83d181c29ddd821a28a;p=vimb.git

Merge branch 'feature/marks'
---

9a52b344f61309b64a19e83d181c29ddd821a28a