# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1316739134 14400
# Node ID 3c7807c230c399082b42195733f5e948e19bd5c1
# Parent  5a201c5b2f530f6ab15241e81d97675fe4eb237f# Parent  d35188ee2a884db7e90ce34a669501b148ebf9bb
Merge.

diff -r d35188ee2a88 -r 3c7807c230c3 .hgsubstate
--- a/.hgsubstate	Thu Sep 22 16:33:32 2011 -0400
+++ b/.hgsubstate	Thu Sep 22 20:52:14 2011 -0400
@@ -13,7 +13,7 @@
 34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
 2dd198c6c412b4ddd361b43586b01981e8383239 vim/bundle/nerdtree
 a0831b09f2026c3a3d52e253ffd139fe20a9360a vim/bundle/pydoc
-e824de36da30baee5adc7be980b907e50099545c vim/bundle/slimv
+60008ab2e25b15148e45b9e9baa349c4b2a1b6c1 vim/bundle/slimv
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
 80ec6539e4139a2e0281a0f1e36d5038d55ad980 vim/bundle/supertab