Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
commit3c398261b75e5501b11238e0f1082cc234e8aeb5
authorWeblate <noreply@weblate.org>
Thu, 24 Mar 2016 06:50:20 +0000 (24 07:50 +0100)
committerWeblate <noreply@weblate.org>
Thu, 24 Mar 2016 06:50:20 +0000 (24 07:50 +0100)
tree5fd124ef7ee39f39e997fc11e8ecea3e40d9248f
parent155ad55e91e266e87a3e8ffa33c6dc9a4a060861
parent7a444c2f170641ce88c72d6087b03dd5aa0e3682
Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6