Merge remote-tracking branch 'pootle/master'
commit15fb569d34a9576dc424e09c23fda58a0c9111bd
authorMichal Čihař <michal@cihar.com>
Fri, 26 Aug 2011 05:45:12 +0000 (26 07:45 +0200)
committerMichal Čihař <michal@cihar.com>
Fri, 26 Aug 2011 05:45:12 +0000 (26 07:45 +0200)
treef91a1f36f3f371b01fe0cc47b036dee510d5a75d
parent433f2c76ee60f683390bd65d14d6996da601c3f3
parentf8d77019cbb5847bbb61a1e905c681b58ceeb18a
Merge remote-tracking branch 'pootle/master'

Conflicts:
po/es.po
po/es.po