Merge branch 'dbus-1.10'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Aug 2016 17:24:10 +0000 (18:24 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Aug 2016 17:24:10 +0000 (18:24 +0100)
commit1a30d452a48fa7c665906f0923adb49fc6ef016e
treef5e58045311e0cdc7000a3a4861181d81cd00230
parent67f2fed1fda147a9ac02d55d6e85013d02c355d2
parentc56cc261646d5f68bf3b1d45e7e550b938bc1fa4
Merge branch 'dbus-1.10'