Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 8 May 2015 14:37:58 +0000 (15:37 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 8 May 2015 14:37:58 +0000 (15:37 +0100)
commit720e3ccb62ad93b25950a4ed82144c98e8e24db8
treefbae24877fbdb893d13f56cf2e5a43d249fb4843
parent84b2682eef49a247d15492d8bf826232e41d3216
parent480f0182fa430e3f5e50e0c719ee0b782cb4aebd
Merge branch 'dbus-1.8'