Merge branch 'dbus-1.8'

Conflicts:
	NEWS
This commit is contained in:
Simon McVittie 2014-11-10 17:10:09 +00:00
commit f44a629679

Diff content is not available