Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 10 Nov 2014 17:10:09 +0000 (17:10 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 10 Nov 2014 17:10:09 +0000 (17:10 +0000)
commitf44a629679b872a11fae7a923d64b540ea3b9646
treebda44440fe5cae654a3650f4e4834bf4eb2506a7
parentcdd9e9a65c40ac4c21dcd36e9bd0fd6c746ad753
parent3210bda8013489484d4ab9f6c4adaf8d662bf6c9
Merge branch 'dbus-1.8'

Conflicts:
NEWS