Merge branch 'dbus-1.6'

Conflicts:
	NEWS
This commit is contained in:
Simon McVittie 2013-08-22 18:03:59 +01:00
commit eca135456b

Diff content is not available