# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1334350198 14400
# Node ID ec3db287229fc2bc03231a62ee565b80db32c55d
# Parent  23cf6df91c2429723298cfb518193733bf2952d6# Parent  2d6a48f28b068e2450bdde2dcac79db59b3cf80a
Merge.

diff -r 23cf6df91c24 -r ec3db287229f .hgsubstate
--- a/.hgsubstate	Fri Apr 13 16:49:47 2012 -0400
+++ b/.hgsubstate	Fri Apr 13 16:49:58 2012 -0400
@@ -3,7 +3,7 @@
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
 9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
-b85d43f6560154269b965e5d9ad9e4a787ca410f vim/bundle/badwolf
+fe251fc8ef2919fc1daf52dd733851630498adc1 vim/bundle/badwolf
 b528cf3de72884dd6cf5fdbeda375d7437ea811f vim/bundle/clam
 c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp
 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion