chiark / gitweb /
Merge commit 'refs/top-bases/features/vim-modelines' into features/vim-modelines features/vim-modelines
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 28 Dec 2011 01:47:49 +0000 (01:47 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 28 Dec 2011 01:47:49 +0000 (01:47 +0000)

Trivial merge