Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/git
authorJiang Xin <worldhello.net@gmail.com>
Mon, 8 Jan 2018 01:17:24 +0000 (09:17 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Mon, 8 Jan 2018 01:17:24 +0000 (09:17 +0800)
commit9c315b944d48f3bb090f6a7bdbd1f5ffdec4fcf0
tree463c42bdd5eef6019a848f5c6c788bc6abb53a15
parentfe73f3eecc0606abc0eb485bf8aef4f4838a8ff1
parent2acb3d4992a8b6b0f7967c748ef43ee8f7606a96
Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/git

* 'fr_2.16-rc1' of git://github.com/jnavila/git:
  l10n: fr.po 2.16 round 2