Merge branch 'dbus-1.8' and prepare 1.9.6
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 1 Jan 2015 23:48:13 +0000 (23:48 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 1 Jan 2015 23:48:13 +0000 (23:48 +0000)
commitae9d7149aa9a9f8f276c35b2343e78aaa7c9054c
tree8697326f4c120119e825b82f96bd239002de3712
parentfda9d8a44aa1bde4f2777fb9ad8650f45820fb6b
parentabbbf449f17e0a74a5d9a50fb5b074e96e9b7030
Merge branch 'dbus-1.8' and prepare 1.9.6

Conflicts:
NEWS
configure.ac
test/dbus-daemon.c
NEWS
bus/driver.c
bus/stats.c
configure.ac
dbus/dbus-sysdeps-win.c
test/dbus-daemon.c