# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1386176875 18000
# Node ID df54cb5699951c168a84d9bf9e5a60a4669a0186
# Parent  6a9528799caa0bba09c021af806494565e4e1a8a# Parent  2de1f78616fd1ecafa0b93fab9f03708d9dee39f
Merge.

diff -r 6a9528799caa -r df54cb569995 bin/colortest
diff -r 6a9528799caa -r df54cb569995 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Wed Dec 04 12:07:12 2013 -0500
+++ b/vim/custom-dictionary.utf-8.add	Wed Dec 04 12:07:55 2013 -0500
@@ -131,3 +131,4 @@
 uuid
 UTC
 MoneyDrop
+namespaces
diff -r 6a9528799caa -r df54cb569995 vim/vimrc
--- a/vim/vimrc	Wed Dec 04 12:07:12 2013 -0500
+++ b/vim/vimrc	Wed Dec 04 12:07:55 2013 -0500
@@ -668,6 +668,8 @@
             \ ]
 
 let g:clojure_highlight_extra_defs = [
+            \ 'defparser',
+            \
             \ 'defproject',
             \
             \ 'defroutes'