From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Dec 2011 01:47:49 +0000 (+0000)
Subject: Merge commit 'refs/top-bases/features/vim-modelines' into features/vim-modelines
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=cfed23b5b79563c7224df89fec8b5e3d91874784

Merge commit 'refs/top-bases/features/vim-modelines' into features/vim-modelines
---

cfed23b5b79563c7224df89fec8b5e3d91874784