Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 26 Jul 2011 17:00:57 +0000 (18:00 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 26 Jul 2011 17:00:57 +0000 (18:00 +0100)
commit6ca26b7700b73087e00861440705577f7689b7a1
treea67941047be590596116117180e8304afd32173f
parent0a6e7cb982d6ed5e3d4b3ecb8be21588b93487cc
parent104dc9383cd17d8202430d85e49ece66be7960a5
Merge branch 'dbus-1.4'

Conflicts:
dbus/dbus-message.c
NEWS
dbus/dbus-message.c