diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2015-07-01 13:15:55 +0200 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2015-07-01 13:15:55 +0200 |
| commit | 36e6270cd1fdac93994548f1563b4f5fd5c24628 (patch) | |
| tree | 5cf1af61a6ccb24eae9c2e3e081e81c38f7e0e3f /debian/patches/series | |
| parent | db0b5876a982e93446fcc2df42c16d3e2b62dcfb (diff) | |
| parent | b35ad09bfc4a26e7ea456f01596aa86576a62b3b (diff) | |
Merge branch 'jessie'
Conflicts:
debian/changelog
debian/control
debian/patches/series
Diffstat (limited to 'debian/patches/series')
| -rw-r--r-- | debian/patches/series | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index f37465a..bbf753a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,5 @@ route_default_nil.patch kfreebsd_support.patch accommodate_typo.patch manpage_fixes.patch +0001-Drop-too-short-control-channel-packets-instead-of-as.patch +update_sample_certs.patch |