| commit | 211299621773591d15ed16bfab93143aa24cab97 | |
| author | Michal Čihař <mcihar@novell.com> | |
| Fri, 14 May 2010 11:54:45 +0000 (14 13:54 +0200) | ||
| committer | Michal Čihař <mcihar@novell.com> | |
| Fri, 14 May 2010 11:54:45 +0000 (14 13:54 +0200) | ||
| tree | d0dc88ad2531b42fe6152082f17eaefea6170cc1 | treesnapshot (tar.gz zip) |
| parent | 5d05a5311233deb85c2b8e1fca2816c2c9fe1a03 | commitdiff |
| parent | 4d77222f973fca1c93ff074db558343a7eeafda1 | commitdiff |
Merge remote branch 'pootle/master'
Conflicts:
po/ur.po
Conflicts:
po/ur.po
| po/ur.po | diff1 | diff2 | blobhistory |