Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Sep 2014 11:36:20 +0000 (12:36 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Sep 2014 11:36:20 +0000 (12:36 +0100)
commit02731e3718588920870576f23628507c51cd804d
tree752fc1bdcbe7355d882b8a620c0ac39063a9411f
parent66bac8c3e3069619f0f8b650d69b249ba55a751f
parent467f7a6d426a37ddc0f9401f592facad3d003dfa
Merge branch 'dbus-1.8'

Conflicts:
NEWS
NEWS
configure.ac