Merge remote-tracking branch 'origin/master'
commitfc978c1e40278421ee2a3578aa596e285e5b6706
authorWeblate <noreply@weblate.org>
Mon, 12 Mar 2018 22:26:07 +0000 (12 23:26 +0100)
committerWeblate <noreply@weblate.org>
Mon, 12 Mar 2018 22:26:07 +0000 (12 23:26 +0100)
treeb68ff6c221a9d96b4d533f05250bd2e7fa81d8af
parentd2aa2f3173319c231e9ec0d2455d98857f5e575c
parent741a50a90527b4bf6a14217d4038f234c13085b9
Merge remote-tracking branch 'origin/master'