Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 21 Jul 2015 16:20:11 +0000 (17:20 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 21 Jul 2015 16:20:11 +0000 (17:20 +0100)
commitdae42b370b7409620f8272d0816a621fd2100ee0
treec9b7399286c7abb17b13b6d4a5e3c6ce29d3a70f
parent27a6538d5bf1f41bb60b039a95a1b1b98728559f
parente5ed2e2105617a9752d3807ebd5909db255b0526
Merge branch 'dbus-1.8'

Conflicts:
.gitignore
NEWS
tools/dbus-monitor.c
NEWS