Merge branch 'master' of github.com:MasseR/dotvim

MasseR · MasseR · commit 3c884b111355 · 2012-02-02T18:10:22.000+02:00
Conflicts:
	vimrc
diff --git a/bundle/snipmate b/bundle/snipmate
@@ -1 +1 @@
-Subproject commit ce7b2d2802a4395b62bc3290eab869263e221318
+Subproject commit 99b1fe56c2e1bbdb193570b775c0aa045b0beb4a
diff --git a/bundle/vimerl b/bundle/vimerl
@@ -1 +1 @@
-Subproject commit c2ce82065a1077c331341426525744810b97a608
+Subproject commit 3541f7f881fd3ef165e5e3f234f7a599b09ca304
diff --git a/vimrc b/vimrc
@@ -64,6 +64,7 @@ abbr iint int
 abbr [9 []
 " In erlang, functions are separated with a semicolon unless it's the last one
 abbr .; .
+abbr functoin function
 
 " Remap \bl to :e # (Open the last edited buffer)
 noremap \bl :e #<cr>
