Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Simon McVittie 2013-10-08 18:42:12 +01:00
commit 76c5deff5c

Diff content is not available