Merge branch 'master' of https://github.com/vnwildman/git
authorJiang Xin <worldhello.net@gmail.com>
Sun, 2 Dec 2018 09:57:24 +0000 (17:57 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sun, 2 Dec 2018 09:57:24 +0000 (17:57 +0800)
Trivial merge