Ivan Tishchenko b53dd48429 Merge remote-tracking branch 'upstream/dev' into upstream/tags ...

Conflicts:
	doc/vimwiki.txt

2015-05-06 17:27:25 +04:00

..

vimwiki.vim

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

2015-05-06 17:27:25 +04:00