Merge branch 'QA_3_5'

Conflicts:
	po/fr.po
	po/pt_BR.po
This commit is contained in:
Rouslan Placella 2012-04-04 21:19:55 +01:00
commit 779c636183

Diff Content Not Available