diff options
| author | Matthew Vernon <matthew@debian.org> | 2014-01-08 08:35:19 +0000 |
|---|---|---|
| committer | Matthew Vernon <matthew@debian.org> | 2014-01-08 08:35:19 +0000 |
| commit | 633221b7ec9a9ff782e4f07fe5b7cf0852bbdbcf (patch) | |
| tree | 38dbfc0ac81d3e3cdd1d5a555adc9bdd75774dfd | |
| parent | bd23210709886d1585494c9153dfcbd938a1a767 (diff) | |
| parent | 3875bb093e2137a8e1a032e55af9446255572c5e (diff) | |
Merge tag 'release_2.6' into dgit/sid
At least in theory, a trivial merge, part of wiring dgit into the
packaging (see the dgit manual). Dgit made a synthetic commit from the
archive, and that needs to be brought into my git history.
0 files changed, 0 insertions, 0 deletions