Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
commit6f6234f9eb305830c3c6da81b31b39052a9e373c
authorWeblate <noreply@weblate.org>
Sat, 23 Dec 2017 14:41:57 +0000 (23 15:41 +0100)
committerWeblate <noreply@weblate.org>
Sat, 23 Dec 2017 14:41:57 +0000 (23 15:41 +0100)
tree532b46f5aa9d0211e172d7e7ab47593151264242
parent0b887068d45679beabfe7f1ee571e15d378732bb
parent88df9e56bf341eaf2c5f7128492cb78e6fba374d
Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7