Merge branch 'dbus-1.10' into dbus-1.10-ci
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 30 Jun 2016 12:57:29 +0000 (13:57 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 30 Jun 2016 12:57:29 +0000 (13:57 +0100)
commitb5bef9dc1647b0516d199e0575e6f2db5a387817
tree0eaef6b8a08d2c8a21840cbf83f8b76e973f98ad
parent727c5429ba94aad935ff7f483fcb350aee00c1dd
parent2fe59f1892825ced87c45ae25d9f5795b1d735b6
Merge branch 'dbus-1.10' into dbus-1.10-ci