Merge branch 'dbus-1.10' into dbus-1.10-ci
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 8 Feb 2016 19:21:02 +0000 (19:21 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 8 Feb 2016 19:21:02 +0000 (19:21 +0000)

Trivial merge