Merge remote-tracking branch 'origin/master'

diff --git a/.gitmodules b/.gitmodules
index f867064a2df1db9586ad039f4c9af642eb7921b1..64d438bc440d7b2252414deec28eac0303ba67f8 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -106,3 +106,6 @@
 [submodule "vim/bundle/vim-togglelist"]
        path = vim/bundle/vim-togglelist
        url = https://github.com/milkypostman/vim-togglelist
+[submodule "vim/bundle/editorconfig-vim"]
+       path = vim/bundle/editorconfig-vim
+       url = https://github.com/editorconfig/editorconfig-vim.git

diff --git a/vim/bundle/editorconfig-vim b/vim/bundle/editorconfig-vim
new file mode 160000 (submodule)
index 0000000..646c180
--- /dev/null
+++ b/vim/bundle/editorconfig-vim
@@ -0,0 +1 @@
+Subproject commit 646c18062e6b168eb485bbc6b51d7c77c23a35e0