# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1352242814 18000
# Node ID e38d6bb92f91c17216bf70148c34d01ed53803ce
# Parent  f2c471e5c6bd96cba854ccc34481847b0bc51cd3# Parent  c23cc701f6c7f40414098e9ca3356c624a2dbe64
Merge.

diff -r f2c471e5c6bd -r e38d6bb92f91 .hgsubstate
--- a/.hgsubstate	Tue Nov 06 17:59:53 2012 -0500
+++ b/.hgsubstate	Tue Nov 06 18:00:14 2012 -0500
@@ -20,7 +20,7 @@
 cd6aec27d127053d18bd2a12713137e41d054208 vim/bundle/python-mode
 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
 61a7567a3cdd68cb65ceb3061071ce66d8110e65 vim/bundle/salt
-eba3ea3cecc57cb3d10635a208c245d46850ddc3 vim/bundle/slimv
+ff17714c2ee46fc752b28511673b8aa4ea8ba174 vim/bundle/slimv
 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 22feac7bc42467a8b17c8b833bd24f36b02759a4 vim/bundle/splice
diff -r f2c471e5c6bd -r e38d6bb92f91 dotcss/simple.com.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotcss/simple.com.css	Tue Nov 06 18:00:14 2012 -0500
@@ -0,0 +1,1 @@
+#intro-progress { display: none; }
diff -r f2c471e5c6bd -r e38d6bb92f91 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Tue Nov 06 17:59:53 2012 -0500
+++ b/vim/custom-dictionary.utf-8.add	Tue Nov 06 18:00:14 2012 -0500
@@ -108,3 +108,9 @@
 filetypes
 Bitbucket
 Lua
+Mercurial's
+subrepositories
+subrepos
+repos
+plugin's
+VCS