Ivan Tishchenko 28114d8c85 Merge remote-tracking branch 'upstream/dev' into 'upstream/tags' ... Conflicts: autoload/vimwiki/base.vim		2015-03-25 21:33:19 +03:00
..
vimwiki.vim	Merge remote-tracking branch 'upstream/dev' into 'upstream/tags'	2015-03-25 21:33:19 +03:00