| commit | a41c510e42db7fc20b0e6abf7bc56a747e7d5a35 | |
| author | Lennart Poettering <lennart@poettering.net> | |
| Wed, 9 Sep 2009 23:54:33 +0000 (10 01:54 +0200) | ||
| committer | Lennart Poettering <lennart@poettering.net> | |
| Wed, 9 Sep 2009 23:54:33 +0000 (10 01:54 +0200) | ||
| tree | 69ed51cd319c7cff5c83db9ae87f4b90ebbea397 | treesnapshot (tar.gz zip) |
| parent | f3879f8f3773255695a42a090771a570c36fb3b1 | commitdiff |
| parent | 4f24a6258a1bef02b31b6b82d3ce0967fa5ab818 | commitdiff |
Merge remote branch 'origin/master-tx'
Conflicts:
po/cs.po
po/kn.po
po/or.po
po/sr.po
po/sr@latin.po
po/te.po
po/uk.po
Conflicts:
po/cs.po
po/kn.po
po/or.po
po/sr.po
po/sr@latin.po
po/te.po
po/uk.po
| po/cs.po | diff1 | diff2 | blobhistory |