Merge remote-tracking branch 'pootle/master'
commit7ee5394b3c25b68d344086314d6f7c6c102a4544
authorMichal Čihař <mcihar@suse.cz>
Mon, 31 Oct 2011 09:01:29 +0000 (31 10:01 +0100)
committerMichal Čihař <mcihar@suse.cz>
Mon, 31 Oct 2011 09:01:29 +0000 (31 10:01 +0100)
treefc2afe20ceaecde3a01f5bfd3413e044d04a5f92
parentad9ba4e6113bfb59c1700081695f52fc3db7cda0
parent1f9a7c633fbdd36b4649242b61b3f3392b5f5cfe
Merge remote-tracking branch 'pootle/master'

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