| commit | aa68720055196ccf365ad169e772133f47430b27 | |
| author | Michal Čihař <mcihar@novell.com> | |
| Mon, 6 Sep 2010 06:59:10 +0000 (6 08:59 +0200) | ||
| committer | Michal Čihař <mcihar@novell.com> | |
| Mon, 6 Sep 2010 06:59:10 +0000 (6 08:59 +0200) | ||
| tree | 5a04d762d867fd3721e0881c62773c4313ed4efd | treesnapshot (tar.gz zip) |
| parent | f209921d416b3ae9f42aa712c2aa0a7a5a30b760 | commitdiff |
| parent | 333fad96c36ba81ea6531eac430f39cad2320ee7 | commitdiff |
Merge remote branch 'pootle/master'
Conflicts:
po/fr.po
po/sl.po
po/zh_CN.po
Conflicts:
po/fr.po
po/sl.po
po/zh_CN.po
| po/fr.po | diff1 | diff2 | blobhistory |
| po/sl.po | diff1 | diff2 | blobhistory |
| po/zh_CN.po | diff1 | diff2 | blobhistory |