Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
commit3990a6c311758db6a67c0b2cb2c2e26034fabf20
authorWeblate <noreply@weblate.org>
Tue, 29 Nov 2016 03:36:00 +0000 (29 04:36 +0100)
committerWeblate <noreply@weblate.org>
Tue, 29 Nov 2016 03:36:00 +0000 (29 04:36 +0100)
tree7ff6bd99779b833eb6e0177fc1ca6cf6dd440d19
parent996f5a591d37d573154952ee928558c5737cf83e
parent9fdc05ce3818fbab3ef9ba185f000c8d6f57368f
Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6