# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1384019935 18000
# Node ID 2de1f78616fd1ecafa0b93fab9f03708d9dee39f
# Parent  574e65200de3ce00a2d25a26a21b327c189fce43# Parent  d25535222d295d72ee46bae6598080344667083d
Merge.

diff -r d25535222d29 -r 2de1f78616fd bin/colortest
diff -r d25535222d29 -r 2de1f78616fd vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Mon Nov 04 10:52:49 2013 -0500
+++ b/vim/custom-dictionary.utf-8.add	Sat Nov 09 12:58:55 2013 -0500
@@ -131,3 +131,4 @@
 uuid
 UTC
 MoneyDrop
+namespaces
diff -r d25535222d29 -r 2de1f78616fd vim/vimrc
--- a/vim/vimrc	Mon Nov 04 10:52:49 2013 -0500
+++ b/vim/vimrc	Sat Nov 09 12:58:55 2013 -0500
@@ -658,6 +658,8 @@
             \ ]
 
 let g:clojure_highlight_extra_defs = [
+            \ 'defparser',
+            \
             \ 'defproject',
             \
             \ 'defroutes'