# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1385180080 28800
# Node ID 2785ea47eae0649e817af01d5d1a9950ecdb5b69
# Parent  1cacc16689cb869e605716fc10880abb787320e9# Parent  71ff712a695176c3d33270fca1fa78dd61363989
Merged changes.

diff -r 71ff712a6951 -r 2785ea47eae0 .hgsubstate
--- a/.hgsubstate	Fri Nov 22 16:19:49 2013 -0800
+++ b/.hgsubstate	Fri Nov 22 20:14:40 2013 -0800
@@ -20,5 +20,5 @@
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
 7a32e0866bfea26cf7781935289df131d1d0c0e0 vim/bundle/supertab
 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a vim/bundle/surround
-7d24ad678ff6b07b402beb97ce9eb7407a9e84b2 vim/bundle/syntastic
+94f710dddedef870736d7c55b387788b9a0afeda vim/bundle/syntastic
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
diff -r 71ff712a6951 -r 2785ea47eae0 vim/vimrc
--- a/vim/vimrc	Fri Nov 22 16:19:49 2013 -0800
+++ b/vim/vimrc	Fri Nov 22 20:14:40 2013 -0800
@@ -228,7 +228,7 @@
 let g:ctrlp_cache_dir = s:vim_home.'/cache'
 
 " Use `pyflakes` with `syntastic`.
-let g:syntastic_python_checker = 'pyflakes'
+let g:syntastic_python_checkers = ['pyflakes']
 
 " Custom Mercurial commands highlighting in Lawrencium.
 let g:lawrencium_hg_commands_file_types = {