Merge branch 'dbus-1.10' into dbus-1.10-ci
authorSimon McVittie <smcv@debian.org>
Mon, 7 Mar 2016 19:45:15 +0000 (19:45 +0000)
committerSimon McVittie <smcv@debian.org>
Mon, 7 Mar 2016 19:45:15 +0000 (19:45 +0000)

Trivial merge