diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-28 12:50:47 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-28 12:50:47 +0200 |
| commit | 77efe478cc59fe205c35036bae8c0d5e0e6913d7 (patch) | |
| tree | 292ddf183b3f38c299bd6614fbd48585aa6d00b2 /test/integration/makefile | |
| parent | 814e1b8d623cb1e6b03c79fcdab6b20754c57038 (diff) | |
| parent | 038e721ad2557fd517eae4b102cd36080f4ee6e3 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
po/vi.po
Diffstat (limited to 'test/integration/makefile')
0 files changed, 0 insertions, 0 deletions