# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1321863455 28800
# Node ID 1c8f40343af3dc2da7c71afd12242b8958244f10
# Parent  f3553a995438ca3720dd18197d0e234a652352aa# Parent  8ab4846e9e288f46dd29397da9d8236723c83349
Merged changes.

diff -r 8ab4846e9e28 -r 1c8f40343af3 vim/.hgsub
--- a/vim/.hgsub	Mon Nov 21 00:09:42 2011 -0800
+++ b/vim/.hgsub	Mon Nov 21 00:17:35 2011 -0800
@@ -2,3 +2,7 @@
 bundle/command-t = [git]https://github.com/wincent/Command-T.git
 bundle/gundo = https://bitbucket.org/sjl/gundo.vim
 bundle/markdown = [git]https://github.com/tpope/vim-markdown.git
+bundle/surround = [git]https://github.com/tpope/vim-surround.git
+bundle/supertab = [git]https://github.com/ervandew/supertab.git
+bundle/nerdtree = [git]https://github.com/scrooloose/nerdtree.git
+
diff -r 8ab4846e9e28 -r 1c8f40343af3 vim/.hgsubstate
--- a/vim/.hgsubstate	Mon Nov 21 00:09:42 2011 -0800
+++ b/vim/.hgsubstate	Mon Nov 21 00:17:35 2011 -0800
@@ -2,3 +2,6 @@
 f19aee00f6b7a9c451a7aa168e05f0cdd0d99374 bundle/command-t
 91190e67720f852c17602504d5225d4e675b6499 bundle/gundo
 2b18a534162bc2c3964cb3a8fe42ca8c100bb571 bundle/markdown
+30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc bundle/nerdtree
+688b5d706c21fbc6b2db6499f3cfbdeb35309b5a bundle/supertab
+4eb2cdfccc016889acfa3b5d63e8f390a87863cf bundle/surround