Merge branch 'dbus-1.10' into dbus-1.10-ci
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 8 Feb 2016 17:35:51 +0000 (17:35 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 8 Feb 2016 17:35:51 +0000 (17:35 +0000)
commitac494ece062573f8c5385a997349f8dcce8d6285
tree9ae83d732c93d3fcec973cc8ef748636bc50f5a1
parentdbeb65c6896b13f3e49768d56e17d98267e35e9a
parent96ffc2a07eb10c0265b654ade972c66e39f9fafb
Merge branch 'dbus-1.10' into dbus-1.10-ci