From: Jens Hoepken <jhoepken@gmail.com>
Date: Tue, 19 Mar 2013 12:58:38 +0000 (+0100)
Subject: Resolve merge conflict
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/26cfc8ef05385a8b5f526c4d461d982a82b119b2?hp=26cfc8ef05385a8b5f526c4d461d982a82b119b2

Resolve merge conflict
---