Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
commit8fd07ac7cabf440d23359f8c1291eae80c3e6255
authorWeblate <noreply@weblate.org>
Sat, 11 May 2013 14:18:39 +0000 (11 16:18 +0200)
committerWeblate <noreply@weblate.org>
Sat, 11 May 2013 14:18:39 +0000 (11 16:18 +0200)
tree993230e67c922566ce1b81272779630e65854dd3
parent4724e4420b8ecf2838f333cf4e34e00b9228a963
parentc1bb060ee374ced7b9390e5803286443132aa23e
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0