Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
commit16506af716dff43bd5e4c268d93aae4444d72bce
authorWeblate <noreply@weblate.org>
Wed, 17 Jul 2013 11:12:19 +0000 (17 13:12 +0200)
committerWeblate <noreply@weblate.org>
Wed, 17 Jul 2013 11:12:19 +0000 (17 13:12 +0200)
tree3d1e846ae952643e6c5a69ee42f6fa7fefea1cf9
parent6db676924283d4f232b9e91e6eca9a0d941681c1
parent5720fb3843dc620c99c1dd29d473b02a5f6c180a
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0