Merge branch 'QA_3_4'
commit8d3ebd746dfbfe4e2ca86121f0448ba7d5187432
authorMichal Čihař <michal@cihar.com>
Mon, 9 May 2011 17:53:41 +0000 (9 19:53 +0200)
committerMichal Čihař <michal@cihar.com>
Mon, 9 May 2011 17:53:41 +0000 (9 19:53 +0200)
treef433329674a3699f9494da4d357895517750391c
parentd086c01ba140b366c4cb61dee6914146df3820d5
parent34ed9aa67a65b4333425014d43ccac3ddbccefda
Merge branch 'QA_3_4'

Conflicts:
po/hu.po
po/hu.po