Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Sep 2014 12:41:12 +0000 (13:41 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Sep 2014 12:41:12 +0000 (13:41 +0100)
commit14fa1a1e750589dd32e02274117077e395f13c16
tree77d23268c10514769139165f89f8f607245adc75
parentd8be7e614ecfceec9a79504c08bd9f5ba81e4d4f
parente2a78c0951212a4f22f95cffe29aa96e11120050
Merge branch 'dbus-1.8'