Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
commitd1451b8bba19c11ea7ce4074a917386c7843402e
authorWeblate <noreply@weblate.org>
Fri, 12 Feb 2016 07:41:21 +0000 (12 08:41 +0100)
committerWeblate <noreply@weblate.org>
Fri, 12 Feb 2016 07:41:21 +0000 (12 08:41 +0100)
tree83089d06ab460d81f5e48de945c16fe51fac1ed1
parentab965e320d98ec9244314383fc96b69b5dfd1a96
parentc6b3292fe5af03e9fb43ceddca11d015cb901515
Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6