Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 30 Apr 2014 20:05:46 +0000 (21:05 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 30 Apr 2014 20:05:46 +0000 (21:05 +0100)
commit6e21873d6331de86e88fd47dfb80af2696e6ff39
tree7efc9561c0f3a8054a9d5290afc83a52bb29bd1e
parent3c287fc38bb9638605b17fa57675d3e2bcb85d64
parent416898324decb7b6d86083a6e2ddc71e8d835feb
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac
NEWS
configure.ac