Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 1 Jul 2011 13:54:42 +0000 (14:54 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 1 Jul 2011 13:54:42 +0000 (14:54 +0100)
commit636a9a29f89326ca07d5bdbd41d874fa13910c17
tree8bf79384dc18c9a354c009afbb2871ae53adb8e8
parent30f116fd2d20cbeb13ed20f1f780d8aa92e67983
parent0dcb9112519d43f00efd7d1f86981d12b25edbc5
Merge branch 'dbus-1.4'
dbus/dbus-connection.c