Merge remote-tracking branch 'pootle/master'
commitcc65e89bb5bb77dd96ffee2c1505f322e44036d7
authorMichal Čihař <mcihar@suse.cz>
Mon, 9 Jan 2012 08:24:55 +0000 (9 09:24 +0100)
committerMichal Čihař <mcihar@suse.cz>
Mon, 9 Jan 2012 08:24:55 +0000 (9 09:24 +0100)
tree59a31a8a4f574fdef53a34ee2a7c2a80873268cd
parent7d8aa04bee5b47b8ae9133996c869ab6179da45f
parent1123fcde2f3cf157a80d6ba51a3969767bd72548
Merge remote-tracking branch 'pootle/master'

Conflicts:
po/bg.po
po/es.po
po/fr.po
po/ja.po
po/ru.po
po/sv.po
po/tr.po
po/bg.po
po/es.po
po/fr.po
po/ja.po
po/ru.po
po/sv.po
po/tr.po