Merge changes from master branch.

* Don't make NetworkManager D-Bus activatable. If the daemon has been
  stopped manually, we don't want it to be autostarted by client requests.
  (Closes: #760998)
* Don't block network.target on NetworkManager-wait-online.service. While at
  it, add a few other minor fixes like the addition of Documentation or
  RemainAfterExit=yes.

1 files changed, 26 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 9748239b..8a01796f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (1.0.0-4) UNRELEASED; urgency=medium
+
+  * Merge changes from master branch.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 31 Mar 2015 07:19:49 +0200
+
 network-manager (1.0.0-3) experimental; urgency=medium
 
   * Add strictly versioned Depends on libnm0 to libnm-dev.
@@ -29,6 +35,26 @@ network-manager (1.0.0-1) experimental; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Fri, 23 Jan 2015 21:26:50 +0100
 
+network-manager (0.9.10.0-7) unstable; urgency=medium
+
+  * Don't make NetworkManager D-Bus activatable. If the daemon has been
+    stopped manually, we don't want it to be autostarted by client requests.
+    (Closes: #760998)
+  * Don't block network.target on NetworkManager-wait-online.service. While at
+    it, add a few other minor fixes like the addition of Documentation or
+    RemainAfterExit=yes.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 31 Mar 2015 07:06:07 +0200
+
+network-manager (0.9.10.0-6) unstable; urgency=medium
+
+  * Detect at runtime whether to start ModemManager. When not running under
+    systemd, start ModemManager via dbus activation. (Closes: #770871)
+  * Do not assert when a device is enslaved externally. Fixes crash when
+    running something like 'brctl addif br0 eth0'. (Closes: #773216)
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 09 Feb 2015 02:29:46 +0100
+
 network-manager (0.9.10.0-5) unstable; urgency=medium
 
   * Cherry-pick upstream commit which prevents breaking PtP TUN interfaces by