Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
commitb2124d031248b328bb7886b597d4d385aaa3df08
authorWeblate <noreply@weblate.org>
Wed, 24 Apr 2013 12:35:53 +0000 (24 14:35 +0200)
committerWeblate <noreply@weblate.org>
Wed, 24 Apr 2013 12:35:53 +0000 (24 14:35 +0200)
tree8077659a1d270f200589161e5ff11b080cc408b5
parent6e939b9af2e9633fc1cef2457fcda8853c0b7f61
parent1cf11c7f3d3562397f13a31768f356160bbbf594
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0