# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1346215477 25200
# Node ID 539d84664c27575943bd9a0f604f828199c2cfd3
# Parent  9495034e7dc455068f15c82212a66680cc9de833# Parent  14307ff18bc16866c5c0cd538e715c18e049a81d
Merged changes.

diff -r 9495034e7dc4 -r 539d84664c27 hgrc/hgrc
diff -r 9495034e7dc4 -r 539d84664c27 vim/vimrc
--- a/vim/vimrc	Tue Aug 28 21:39:44 2012 -0700
+++ b/vim/vimrc	Tue Aug 28 21:44:37 2012 -0700
@@ -236,7 +236,7 @@
 
         " File I know are markdown: personal notes & PieCrust pages.
         autocmd BufRead,BufNewfile */Dropbox/Personal/SimpleNote/* set ft=markdown
-        autocmd BufRead,BufNewFile */_content/**/*.html set ft=markdown
+        autocmd BufRead,BufNewFile */_content/**/*.html set ft=piecrustmarkdown
 
     augroup END