Commit 4a7cb0cb authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'dbus-1.8'

Conflicts:
	NEWS
	configure.ac
parents d97e8f95 a559ed35
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment