From: Ben Williams <bwilliams@gryphonnetworks.com>
Date: Tue, 20 Nov 2012 15:39:33 +0000 (-0500)
Subject: Merge branch 'master' of github.com:plasticboy/vim-markdown
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/3309ad4d293d2431008d7ec56faadfdcf334d5b9?ds=sidebyside

Merge branch 'master' of github.com:plasticboy/vim-markdown

Conflicts:
	README.md
---

3309ad4d293d2431008d7ec56faadfdcf334d5b9