Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 3 May 2011 09:27:52 +0000 (10:27 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 3 May 2011 09:27:52 +0000 (10:27 +0100)
commit2dd5f88cd45213733d0ae5bcda4c05a4590fb2a0
treefb845745de6ee23073442738778766715e5237f9
parent46b8034540b34d63c6b56a7eb2ca4507496ee747
parent7daecaecf19aba8971aad9cb88d6a3e75b0ad902
Merge branch 'dbus-1.4'
dbus/dbus-connection.c