| commit | b275e7fb1e80d31886f583672ecc71bb57686f7b | |
| author | Michal Čihař <mcihar@novell.com> | |
| Tue, 7 Sep 2010 13:20:44 +0000 (7 15:20 +0200) | ||
| committer | Michal Čihař <mcihar@novell.com> | |
| Tue, 7 Sep 2010 13:20:44 +0000 (7 15:20 +0200) | ||
| tree | bc43a0864144747e5ce7bb7245480debd23f9f82 | treesnapshot (tar.gz zip) |
| parent | a727fd587d4b4bf800247129517b6bbb47232c24 | commitdiff |
| parent | 0ec8c0b7ac0e1bab51fbb884c0325cc38d7e1faa | commitdiff |
Merge remote branch 'pootle/master'
Conflicts:
po/nb.po
Conflicts:
po/nb.po
| po/nb.po | diff1 | diff2 | blobhistory |