Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 28 Apr 2014 14:46:53 +0000 (15:46 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 28 Apr 2014 14:46:53 +0000 (15:46 +0100)
commit6ebf75590e8af223308aa5b490737ce9e962bd49
treef6e71996e716b6fbadbec4eaac95124701f65e67
parentd274bd42fe69272f55fabad5bc3da13d879a8d8d
parent370ba31171f83dcd74e3b369338308f7cbb11a7f
Merge branch 'dbus-1.8'

Conflicts:
NEWS
NEWS
dbus/dbus-sysdeps-unix.c