Merge branch 'dbus-1.10'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 25 Jul 2016 11:11:39 +0000 (12:11 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 25 Jul 2016 11:11:39 +0000 (12:11 +0100)
commit2fd7b418c18d463d7f1b1a005a7f844114bb129e
treeca3a231c4dab88f3723e49624d8f26a8b422386a
parent33878930d9e818655ceba5efcf2c2537cec9acf1
parentbed268845241ac0315b5684adb82c6994d3acaa3
Merge branch 'dbus-1.10'