From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 21 Jul 2013 20:16:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/vim'
X-Git-Tag: pango~188
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9485620a5d96ba653cd85a76927b8e1730bc80aa;p=people%2Fstevee%2Fipfire-3.x.git

Merge remote-tracking branch 'stevee/vim'
---

9485620a5d96ba653cd85a76927b8e1730bc80aa