Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
commit33e32daf17441473b7d17d281b98d973c3ef4bda
authorWeblate <noreply@weblate.org>
Thu, 31 Mar 2016 10:37:10 +0000 (31 12:37 +0200)
committerWeblate <noreply@weblate.org>
Thu, 31 Mar 2016 10:37:10 +0000 (31 12:37 +0200)
tree3dd48fbc1e757564af992cd9bdf3ac69637d11d8
parent863d2fb4c397b80f345f127bf68b656cc0205c1e
parent6d7acf969a1ef98f37701be1935fb015b1bb39ba
Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6