| commit | dcfd69ee6ae7b84263f3144bef09fd1d8e20c7e4 | |
| author | Pootle server <pootle@cihar.com> | |
| Sun, 9 May 2010 18:26:10 +0000 (9 20:26 +0200) | ||
| committer | Pootle server <pootle@cihar.com> | |
| Sun, 9 May 2010 18:26:10 +0000 (9 20:26 +0200) | ||
| tree | baa2d6dec97acf43a218d20d365fb6bbced70191 | treesnapshot (tar.gz zip) |
| parent | b57ff81032547f5e17d9cba3de42dbe31820aa77 | commitdiff |
| parent | a3b034eacdb09bc6d5ef268bc68be2eeaf54e985 | commitdiff |
Merge remote branch 'origin/master'
Conflicts:
po/fr.po
Conflicts:
po/fr.po
| po/fr.po | diff1 | diff2 | blobhistory |