Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 11 Jun 2014 10:46:27 +0000 (11:46 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 11 Jun 2014 10:46:27 +0000 (11:46 +0100)
commitd002a430cc84ff4a45589d7955ab2f9382f02745
treeff8a8d39913ae2c39de2f049e57dd88e058e4377
parent8ab5793b177b8192336a738ae03d2e802630ec7e
parent019d19214326115bfb53401db3023fe31caa280f
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac
NEWS