From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 30 Sep 2015 14:49:20 +0000 (+0100)
Subject: Merge branch 'dbus-1.10'
X-Git-Tag: dbus-1.11.0~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f01817415efb937d8cf19f44eca005ba8f983be;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.10'
---

9f01817415efb937d8cf19f44eca005ba8f983be
diff --cc NEWS
index 096ce1242,b5b943689..52fcf876f
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,10 +1,10 @@@
 -D-Bus 1.10.2 (UNRELEASED)
 +D-Bus 1.11.0 (UNRELEASED)
  ==
  
- ...
+ Fixes:
+ 
+ • On Windows, fix the logic for replacing the installation prefix
+   in service files' Exec lines (fd.o #83539; Milan Crha, Simon McVittie)
  
  D-Bus 1.10.0 (2015-08-25)
  ==