# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1292375623 18000
# Node ID 29ed704bc669e131b683df97daa7069bbb7d124e
# Parent  1e291f276d2160d5ac9e9b0db5d74c935211524f# Parent  cae75a813ef916c1b60e9444501c19c8e39e4deb
Merge.

diff -r 1e291f276d21 -r 29ed704bc669 .hgignore
--- a/.hgignore	Tue Dec 14 20:12:58 2010 -0500
+++ b/.hgignore	Tue Dec 14 20:13:43 2010 -0500
@@ -14,3 +14,4 @@
 
 mutt/temp
 mutt/cache
+vim/spell
diff -r 1e291f276d21 -r 29ed704bc669 .hgsubstate
--- a/.hgsubstate	Tue Dec 14 20:12:58 2010 -0500
+++ b/.hgsubstate	Tue Dec 14 20:13:43 2010 -0500
@@ -1,6 +1,6 @@
 0beba32679db6cf5db08ae57c5e99e411b54adc5 mercurial/templates
 b6be751b4b4391e7e25ba51e36300a8e04820846 vim/bundle/ack
-206d80115d82fbb98d4c8fcb9bd4ab4c58179a9b vim/bundle/gundo
+810362206db582441cb91d788838014219dc8c3e vim/bundle/gundo
 1535425d6987812aa87e2123d0e509b847b893d5 vim/bundle/html5
 34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
 930be32a23e902ddc46135ddbb9e76b0fac0c14b vim/bundle/nerdcommenter