Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 4 Feb 2015 17:06:54 +0000 (17:06 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 4 Feb 2015 17:07:25 +0000 (17:07 +0000)
commit4a0f1849be319b1b2b7a6d415b57e5544ec191d6
tree30102b1f49ed560ed6e7f88e37ac3010e46a9816
parent1f05dc97445a84f226cf9c055c9d3ed70ed6c7b4
parent3a78d91694236f2a12626987cfc0b94891691576
Merge branch 'dbus-1.8'