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