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