Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 6 Mar 2014 13:11:09 +0000 (13:11 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 6 Mar 2014 13:11:09 +0000 (13:11 +0000)
commitf4423d4c09c6a4625391fc788f00b4fb38ca1f38
tree54327d7d478c4ddeb2df451cfca122b8bc7b87fa
parent1895a8ee5b0e3813b571e9db3528611802ea7f7e
parent9e7610ef1700dde369630e22be3623887577590d
Merge branch 'dbus-1.8'