Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 14 May 2015 13:41:06 +0000 (14:41 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 14 May 2015 13:41:06 +0000 (14:41 +0100)
commit1c4f87ca2849ae49d6083a5a279d870aee52b5a3
treef8d9ac380dff3bba10aef8913df5441793be4ea9
parentbcdead0fd4642a5e8985981c1583d40ff779299a
parent31489e1c4ffdbac220e1cde72fc5ce4ad43d3821
Merge branch 'dbus-1.8'

Conflicts:
NEWS
cmake/CMakeLists.txt
configure.ac
NEWS