Merge remote branch 'pootle/master'
commitf048865abaeee728d159d0130cfc5240b00358e2
authorMichal Čihař <michal@cihar.com>
Fri, 31 Dec 2010 11:52:00 +0000 (31 12:52 +0100)
committerMichal Čihař <michal@cihar.com>
Fri, 31 Dec 2010 11:52:00 +0000 (31 12:52 +0100)
treeb8de40224ab6f70aaa897e5df6be8e354589ce56
parentc19200e4e279981d2c14af9991564e6501b50c78
parent12b6fc11ed702d715a0521a4f90b7e7b99e9b232
Merge remote branch 'pootle/master'