Merge remote-tracking branch 'origin/master'
commit6f1447d84e38b6ef70996241f32c5e72c69f91ed
authorWeblate <noreply@weblate.org>
Sat, 9 Sep 2017 17:57:59 +0000 (9 19:57 +0200)
committerWeblate <noreply@weblate.org>
Sat, 9 Sep 2017 17:57:59 +0000 (9 19:57 +0200)
tree04e71f411be760740b306f6b080bb3cdb72597c7
parentffe3aa759cbc7c53c8868891cb9b2bb272d370c9
parent711b462deaf601b9da383fa8805d4c8c911c3e3e
Merge remote-tracking branch 'origin/master'