Merge remote-tracking branch 'pootle/master'
commit39d85a3134c7e5feb2a968333eb6b04f95e69456
authorMichal Čihař <mcihar@novell.com>
Wed, 18 May 2011 14:51:04 +0000 (18 16:51 +0200)
committerMichal Čihař <mcihar@novell.com>
Wed, 18 May 2011 14:51:04 +0000 (18 16:51 +0200)
tree017f5bc6d262ecb7961b5641ce8859b982dd0564
parent0a345d8ee1ae4fc7ad0043ec3ee60b5d66fb4d68
parent76946587ba0390b4c1af313436889e02b8cfe643
Merge remote-tracking branch 'pootle/master'

Conflicts:
po/bg.po
po/sk.po
po/bg.po
po/sk.po