| commit | 48a5309632cb47055dd6d9cec66718a99875f6bb | |
| author | Michal Čihař <mcihar@novell.com> | |
| Wed, 1 Dec 2010 08:53:12 +0000 (1 09:53 +0100) | ||
| committer | Michal Čihař <mcihar@novell.com> | |
| Wed, 1 Dec 2010 08:53:12 +0000 (1 09:53 +0100) | ||
| tree | 53d861d88fc1a8e4e569cf77ece920fbbb344261 | treesnapshot (tar.gz zip) |
| parent | e4b52c6e7b810b144dfbe4ffa93c1f6934e5c9f8 | commitdiff |
| parent | 32a286719449ee56543221b013cddbf84541c203 | commitdiff |
Merge remote branch 'pootle/master'
Conflicts:
po/sl.po
Conflicts:
po/sl.po
| po/sl.po | diff1 | diff2 | blobhistory |