Merge branch 'MAINT_3_4_0' into QA_3_4
commitb4a46962e950c46e25a1f72f009d5af6fe12c1cc
authorMichal Čihař <mcihar@novell.com>
Mon, 9 May 2011 12:15:47 +0000 (9 14:15 +0200)
committerMichal Čihař <mcihar@novell.com>
Mon, 9 May 2011 12:15:47 +0000 (9 14:15 +0200)
treebac8a10342119467e4ee2324c49eb258f8804da3
parenta22c528ad40cc20924ec789ace883d29193f4761
parent742ca4841b2cbc40647970a912e2e0e3ffdca68a
Merge branch 'MAINT_3_4_0' into QA_3_4

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