| commit | 2731fc3ac4e8d9f7a10e769a70a4a7946954ac0e | |
| author | Michal Čihař <michal@cihar.com> | |
| Tue, 27 Oct 2009 11:58:35 +0000 (27 12:58 +0100) | ||
| committer | Michal Čihař <michal@cihar.com> | |
| Tue, 27 Oct 2009 11:58:35 +0000 (27 12:58 +0100) | ||
| tree | 8f7466cfce473b114f0b846aa6a0bf554d1b106c | treesnapshot (tar.gz zip) |
| parent | cd7b3baacb59e98127dc84accb489d8eae3bcee2 | commitdiff |
| parent | fc04ca19f74820416f6c99587fb9ab3d93f36eaa | commitdiff |
Merge branch 'master' of /home/git/wammu
Conflicts:
locale/nl/wammu.po
Conflicts:
locale/nl/wammu.po
| locale/nl/wammu.po | diff1 | diff2 | blobhistory |