Merge branch 'dbus-1.10-ci'
authorSimon McVittie <smcv@debian.org>
Wed, 2 Dec 2015 18:51:57 +0000 (18:51 +0000)
committerSimon McVittie <smcv@debian.org>
Wed, 2 Dec 2015 18:52:10 +0000 (18:52 +0000)
commit5b0953fd5b165c6bb7aa3d12b79aded63aec8982
treef83d21d56c0b5457419ee4cb6394271972bbe7e3
parent2cd1862028134279893a500fef942184b2a04e15
parent6db53271b18a987a12cf0109f685646d4bc4aa7a
Merge branch 'dbus-1.10-ci'

No actual change; this is just to mark the conflicts as resolved.