Merge branch 'dbus-1.10'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 25 Jan 2016 15:06:43 +0000 (15:06 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 25 Jan 2016 15:06:43 +0000 (15:06 +0000)
commit67e627ef6cc60e5b0c01ad7d08ce8c50693f0552
treee08969b782e68365301a6056a979384ba4b93fbc
parent628750d806470db76f7e49f5ebff53e671e2bfc2
parent7eb34fc2cdb637974976ccaf3a9996059f09758f
Merge branch 'dbus-1.10'