From: Daniel Hahler <git@thequod.de>
Date: Sun, 18 Nov 2018 11:00:33 +0000 (+0100)
Subject: Merge branch 'master' into searchpair-timeout
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/c2e53f8cab69594b3fffbbdcbbe38acafdb7ca19?hp=c2e53f8cab69594b3fffbbdcbbe38acafdb7ca19

Merge branch 'master' into searchpair-timeout

Conflicts:
	indent/python.vim
---