Merge branch 'dbus-1.10' into dbus-1.10-ci
authorSimon McVittie <smcv@debian.org>
Wed, 2 Mar 2016 18:52:34 +0000 (18:52 +0000)
committerSimon McVittie <smcv@debian.org>
Wed, 2 Mar 2016 18:52:34 +0000 (18:52 +0000)

Trivial merge