diff options
author | Samuel Thibault <sthibault@debian.org> | 2011-03-20 23:29:37 +0000 |
---|---|---|
committer | Samuel Thibault <sthibault@debian.org> | 2011-03-20 23:29:37 +0000 |
commit | 2081ff5d2b74687915aa0deee96bff96d720e8c3 (patch) | |
tree | 7596eaf69fc3ef2429a7413e34f383715ef6694e /serverboot | |
parent | fc18498452d5a698abe8bcca404b9a2ef1555d9f (diff) | |
parent | 179592e9ee8e6fd149419455122f584387f5a05f (diff) |
Merge branch 'master' of ssh://git.debian.org/git/pkg-hurd/hurd
Conflicts:
debian/changelog
Diffstat (limited to 'serverboot')
0 files changed, 0 insertions, 0 deletions