Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
commit401a18464edb691e8fb9ba8a54e697917bf4484f
authorWeblate <noreply@weblate.org>
Thu, 22 Dec 2016 14:15:55 +0000 (22 15:15 +0100)
committerWeblate <noreply@weblate.org>
Thu, 22 Dec 2016 14:15:55 +0000 (22 15:15 +0100)
tree26706e082227c6dbd07462da4183bbcaff00e4f6
parent671d82f8cc764b933e587d52d8db5c7b817dcdaa
parent1fb040a1df77afd8059683b29fd09c6e17a8d6e6
Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6