Ivan Tishchenko 7bc2fcb3a7 Merge remote-tracking branch 'vimwiki/dev' into 'vimwiki/tags' ...

Conflicts:
	doc/vimwiki.txt
	ftplugin/vimwiki.vim

2015-02-12 22:20:16 +03:00

..

vimwiki.txt

Merge remote-tracking branch 'vimwiki/dev' into 'vimwiki/tags'

2015-02-12 22:20:16 +03:00