Merge remote-tracking branch 'origin/master'
commitde453b44ad97321b5f59a38963e835cb0e143d99
authorWeblate <noreply@weblate.org>
Fri, 19 May 2017 22:36:03 +0000 (20 00:36 +0200)
committerWeblate <noreply@weblate.org>
Fri, 19 May 2017 22:36:03 +0000 (20 00:36 +0200)
treeb037d0a81eac6e3f59d708951301170d247935bc
parent7618ff63b1b73fea4deb54cfe3ee3ed5b6a9b097
parentb7c11ab5599a9f92ffc35506c9074de249c282ce
Merge remote-tracking branch 'origin/master'