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

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

9880404af7dae451223ccbb6d961dc09f8f02947