diff options
| author | Michael Biebl <biebl@debian.org> | 2013-05-06 05:59:22 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-05-06 05:59:22 +0200 |
| commit | 34bed97db17329489e20a23e281b5c6c54b38ef4 (patch) | |
| tree | 65ba1cbf9b6af5a75a89f4357b2401b4b74f8ccf | |
| parent | 0aaa1caa9398d85bf018b2c7e999b6915a5e015c (diff) | |
| parent | a1c762f5219d67fcbb59e067355ce5eca6213ea4 (diff) | |
Merge branch 'master' into experimental
Conflicts: debian/changelog debian/patches/series
| -rw-r--r-- | debian/changelog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 64325a9c..8fa231e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,6 +88,14 @@ network-manager (0.9.5.95-1) experimental; urgency=low -- Michael Biebl <biebl@debian.org> Fri, 29 Jun 2012 20:30:16 +0200 +network-manager (0.9.4.0-10) unstable; urgency=low + + * debian/patches/21-carrier-detect.patch: ensure carrier is always on for + devices that don't support detection (rh #816719). (Closes: #699292) + Patch cherry-picked from upstream Git. + + -- Michael Biebl <biebl@debian.org> Wed, 30 Jan 2013 01:12:53 +0100 + network-manager (0.9.4.0-9) unstable; urgency=low * Change the ifupdown dispatcher script and set ADDRFAM to "inet" or "inet6" |