Merge branch 'fr_2.20_round3' of git://github.com/jnavila/git
authorJiang Xin <worldhello.net@gmail.com>
Sun, 2 Dec 2018 14:36:36 +0000 (22:36 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sun, 2 Dec 2018 14:36:36 +0000 (22:36 +0800)
Trivial merge