Merge branch 'dbus-1.8'

Conflicts:
	NEWS

diff --cc NEWS
index 04d5454,9749a34..9059958
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,41 -1,15 +1,46 @@@
 -D-Bus 1.8.20 (UNRELEASED)
 +D-Bus 1.9.18 (UNRELEASED)
  ==
  
 -D-Bus 1.8.18 (2015-05-14)
 +Configuration changes:
 +
 +• The basic setup for the well-known system and session buses is now done
 +  in read-only files in ${datadir}, moving a step closer to systems
 +  that can operate with an empty /etc directory. In increasing order
 +  of precedence:
 +
 +  · ${datadir}/dbus-1/s*.conf now perform the basic setup such as setting
 +    the default message policies.
 +  · ${sysconfdir}/dbus-1/s*.conf are now optional. By default
 +    dbus still installs a trivial version of each, for documentation
 +    purposes; putting configuration directives in these files is deprecated.
 +  · ${datadir}/dbus-1/s*.d/ are now available for third-party software
 +    to install "drop-in" configuration snippets (any packages
 +    using those directories should explicitly depend on at least this
 +    version of dbus).
 +  · ${sysconfdir}/dbus-1/s*.d/ are also still available for sysadmins
 +    or third-party software to install "drop-in" configuration snippets
 +  · ${sysconfdir}/dbus-1/s*-local.conf are still available for sysadmins'
 +    overrides
 +
 +  ${datadir} is normally /usr/share, ${sysconfdir} is normally /etc,
 +  and "s*" refers to either system or session as appropriate.
 +
 +  (fd.o #89280, Dimitri John Ledkov)
 +
+ Fixes:
+ 
+ • Fix a memory leak when GetConnectionCredentials() succeeds
+   (fd.o #91008, Jacek Bukarewicz)
+ 
 +D-Bus 1.9.16 (2015-05-14)
  ==
  
 -The “unicorn rifts” release.
 +The “titanium barns” release.
 +
 +Dependencies:
 +
 +• Automake 1.13 is now required when compiling from git or modifying
 +  the build system.
  
  Security hardening:
  

diff --cc bus/driver.c
Simple merge