| commit | b5a3b7e8f9fb5bb7d8d88bd401510be753fc2c10 | |
| author | Michal Čihař <michal@cihar.com> | |
| Wed, 28 Jul 2010 14:41:04 +0000 (28 16:41 +0200) | ||
| committer | Michal Čihař <michal@cihar.com> | |
| Wed, 28 Jul 2010 14:41:04 +0000 (28 16:41 +0200) | ||
| tree | fc2e43fe816481367605201c67605d1e5b53e398 | treesnapshot (tar.gz zip) |
| parent | e5ec539868244262ef8a40e774732206f72b4d21 | commitdiff |
| parent | 5b3be48a474ad31a3d9c8582046f1c619cb09176 | commitdiff |
Merge remote branch 'pootle/master'
Conflicts:
po/ug.po
po/uk.po
Conflicts:
po/ug.po
po/uk.po
| po/ug.po | diff1 | diff2 | blobhistory |
| po/uk.po | diff1 | diff2 | blobhistory |