Merge remote branch 'pootle/master'
commit326f7e13a982d164c89c0655402843f1fe88e651
authorMichal Čihař <mcihar@novell.com>
Mon, 31 Jan 2011 09:01:31 +0000 (31 10:01 +0100)
committerMichal Čihař <mcihar@novell.com>
Mon, 31 Jan 2011 09:01:31 +0000 (31 10:01 +0100)
tree2e5c461af6e1ad858a6453da83c7662af6a384c1
parent534d93fa4600c4edab647a0cbb2b260bef2d3994
parentafad83c975fe52c39db09e93bc9fb6b9c45b0f0f
Merge remote branch 'pootle/master'

Conflicts:
po/ru.po
po/ru.po