3cfeff1930
* 'option-no-mapping' of git://github.com/suy/vim-indent-guides: Add option g:indent_guides_default_mapping Conflicts: plugin/indent_guides.vim