Merge branch 'dbus-1.8'

Conflicts:
	NEWS
	configure.ac

diff --cc NEWS
index 2accc0b,9a2b889..592515b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,26 -1,13 +1,47 @@@
 -D-Bus 1.8.3 (UNRELEASED)
 +D-Bus 1.9.0 (UNRELEASED)
  ==
  
 +Requirements:
 +
 +• Support for the systemd: (LISTEN_FDS) pseudo-transport on Linux now
 +  requires the sd-daemon shared library, dropping the embedded convenience
 +  copy (fd.o #71818, Simon)
 +
 +Build-time configuration changes:
 +
 +• The CMake build system now builds the same shared library name as Autotools
 +  on at least Linux and Windows:
 +  - on Linux (and perhaps other Unix platforms), it previously built
 +    libdbus-1.so, but now builds libdbus-1.so.3.* with development
 +    symlink libdbus-1.so and SONAME/symlink libdbus-1.so.3
 +  - on Windows, it previously built either libdbus-1.dll (release) or
 +    libdbus-1d.dll (debug), but now builds libdbus-1-3.dll, copied to
 +    libdbus-1.dll for compatibility with older applications.
 +  (fd.o #74117, Ralf Habacker)
 +
 +Enhancements:
 +
++• on Unix platforms, disable Nagle's algorithm on TCP connections to improve
++  initial latency (fd.o #75544, Matt Hoosier)
++
++Fixes:
++
++• fix an incorrect error message if a Unix socket path is too long
++  (fd.o #73887, Antoine Jacoutot)
++
++• in an MSYS/Cygwin environment, pass Unix-style filenames to xmlto,
++  fixing documentation generation (fd.o #75860, Руслан Ижбулатов)
++
++• in Unix with X11, avoid giving dbus-launch a misleading argv[0]
++  in ps(1) (fd.o #69716, Chengwei Yang)
++
+ D-Bus 1.8.2 (2014-04-30)
+ ==
+ 
+ The “nobody wants red” release.
+ 
+ Enhancements:
+ 
  • in the CMake build system, add some hints for Linux users cross-compiling
    Windows D-Bus binaries to be able to run tests under Wine
    (fd.o #41252, Ralf Habacker)

diff --cc configure.ac
index 13d1c87,767662d..5fdc566
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3,7 -3,7 +3,8 @@@ AC_PREREQ([2.63]
  
  m4_define([dbus_major_version], [1])
  m4_define([dbus_minor_version], [8])
 -m4_define([dbus_micro_version], [3])
 +m4_define([dbus_micro_version], [99])
++m4_define([dbus_micro_version], [1])
  m4_define([dbus_version],
            [dbus_major_version.dbus_minor_version.dbus_micro_version])
  AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus])