Merge branch 'dbus-1.10'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Feb 2016 15:26:00 +0000 (15:26 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Feb 2016 15:26:00 +0000 (15:26 +0000)
commitb1a8a522083c78e72cb39826b02da2cd6cedda41
tree63c3f7ab4803c453750920b1cbe470256259ea54
parentfb9aa3aa6fd1883e5728c7412056556b63716b7b
parent384c924c77ecb32e5b91d737b8b51cb0e883fd7c
Merge branch 'dbus-1.10'