| commit | c1608b6bd6ccc8a3f93e35cf32cf35b5fc97255c | |
| author | Michal Čihař <mcihar@suse.cz> | |
| Mon, 19 Sep 2011 13:53:54 +0000 (19 15:53 +0200) | ||
| committer | Michal Čihař <mcihar@suse.cz> | |
| Mon, 19 Sep 2011 13:53:54 +0000 (19 15:53 +0200) | ||
| tree | 8b0a4e5b8ddd41f645fa21046101fe3658538e07 | treesnapshot (tar.gz zip) |
| parent | 1bee5260eae82ef49acd9a6265794688450a5f6e | commitdiff |
| parent | f2ba09ac65252764427cf56307c44df0539eb370 | commitdiff |
Merge remote-tracking branch 'pootle/master'
Conflicts:
po/es.po
po/fr.po
Conflicts:
po/es.po
po/fr.po
| po/es.po | diff1 | diff2 | blobhistory |
| po/fr.po | diff1 | diff2 | blobhistory |