| commit | ec0feca1f52d1443de5e5d42a80fc2f249c10195 | |
| author | Michal Čihař <mcihar@novell.com> | |
| Thu, 19 May 2011 07:40:05 +0000 (19 09:40 +0200) | ||
| committer | Michal Čihař <mcihar@novell.com> | |
| Thu, 19 May 2011 07:40:05 +0000 (19 09:40 +0200) | ||
| tree | 234e9f578dfa19d2355cd3c5541f1855ac729eb6 | treesnapshot (tar.gz zip) |
| parent | 39d85a3134c7e5feb2a968333eb6b04f95e69456 | commitdiff |
| parent | 0d4cf5d9f1f755b020650e4697ffe8cceafe3c0e | commitdiff |
Merge remote-tracking branch 'pootle/master'
Conflicts:
po/bg.po
po/en_GB.po
po/fr.po
Conflicts:
po/bg.po
po/en_GB.po
po/fr.po
| po/bg.po | diff1 | diff2 | blobhistory |
| po/en_GB.po | diff1 | diff2 | blobhistory |
| po/fr.po | diff1 | diff2 | blobhistory |