# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1353368870 18000
# Node ID 7e89ab9326f934d5d87391870dcfb17daa83552b
# Parent  9e1083cfc82abdbbe257d92d9dc3958c4f9200ef# Parent  86976421465f281fc828a6b9d9eb63f9d63837b7
Merge.

diff -r 86976421465f -r 7e89ab9326f9 .hgsubstate
--- a/.hgsubstate	Mon Nov 19 13:28:03 2012 -0500
+++ b/.hgsubstate	Mon Nov 19 18:47:50 2012 -0500
@@ -20,7 +20,7 @@
 cd6aec27d127053d18bd2a12713137e41d054208 vim/bundle/python-mode
 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
 61a7567a3cdd68cb65ceb3061071ce66d8110e65 vim/bundle/salt
-ff17714c2ee46fc752b28511673b8aa4ea8ba174 vim/bundle/slimv
+61d7f88407263a1a0362affa076d2b1143cccd72 vim/bundle/slimv
 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 22feac7bc42467a8b17c8b833bd24f36b02759a4 vim/bundle/splice
diff -r 86976421465f -r 7e89ab9326f9 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Mon Nov 19 13:28:03 2012 -0500
+++ b/vim/custom-dictionary.utf-8.add	Mon Nov 19 18:47:50 2012 -0500
@@ -114,6 +114,7 @@
 repos
 plugin's
 VCS
+Vimscript's
 namespacing
 autocommands
 autocommand