diff options
| author | Michael Biebl <biebl@debian.org> | 2011-09-16 02:24:13 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-09-16 02:24:13 +0200 |
| commit | 25fb7cee8a86af280ff2aa965969ac8cdfa829ec (patch) | |
| tree | 46ce935ef8fbfb35bc019c96cbf540bb80ab9b0b | |
| parent | c3652c1f7e4f965311a5c8497c92ca73ffec7ae4 (diff) | |
| parent | 1ca449e79e1180f71f6e7d4683341daa900555e9 (diff) | |
Merge branch 'master' into experimental
Conflicts: debian/changelog
| -rw-r--r-- | debian/changelog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d1569f88..4b738e57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,6 +73,16 @@ network-manager (0.8.998-1) experimental; urgency=low -- Michael Biebl <biebl@debian.org> Sat, 09 Apr 2011 06:49:57 +0200 +network-manager (0.8.4.0-2) unstable; urgency=low + + * Update package descriptions. + * debian/network-manager-dispatcher.script + - Handle dhcp4-change and dhcp6-change events (by doing nothing). This + prevents the 01ifupdown dispatcher script from logging an error on DHCP + lease changes. (Closes: #628154) + + -- Michael Biebl <biebl@debian.org> Sun, 29 May 2011 22:22:08 +0200 + network-manager (0.8.4.0-1) unstable; urgency=low * New upstream release. |