Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 5 Jan 2015 15:00:45 +0000 (15:00 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 5 Jan 2015 15:00:45 +0000 (15:00 +0000)
commit4a7cb0cb6f9d2269b7fc83d491a88f032a69d084
tree9dc650819bd5f41ca405dadb880b1f6d718a3e70
parentd97e8f95aad270acb58f3d7e7b92da5cc087e02b
parenta559ed35089dc0e2b44c80d28c5a2408c82483bc
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac