Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
commitfbca6944d30a95d733e1f01a973c66ae8b488a8e
authorWeblate <noreply@weblate.org>
Wed, 17 May 2017 13:42:35 +0000 (17 15:42 +0200)
committerWeblate <noreply@weblate.org>
Wed, 17 May 2017 13:42:35 +0000 (17 15:42 +0200)
tree149fd882aff7636495886763177f0eba0062f37f
parentee12c231945d02dd61e7ed5464cbb02f3d8cb5b8
parent660123d22850ea8d9b5d6a0f67d819665ad8c439
Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7