diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 10:39:26 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 10:39:26 +0000 |
| commit | f966eb26edd102d2cc16ad1625d9bf6cdadb8430 (patch) | |
| tree | ad58601d1b583323b7c456755c7fbf402fd675e2 /debian/copyright | |
| parent | 62f96ef747efc2494f0720552afa2a8bbe7ddd06 (diff) | |
| parent | 43f76a844a02dcc5df450a632bd5e35cf5bae0a6 (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
Conflicts:
debian/changelog
Diffstat (limited to 'debian/copyright')
0 files changed, 0 insertions, 0 deletions