Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Aug 2011 09:26:13 +0000 (10:26 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Aug 2011 09:26:13 +0000 (10:26 +0100)
commitc99a3df254dbfcd945de919054c391c5565460af
tree7e9da29b9b08d00adc0c6d0668d384dd0d45d1dc
parent0611a71c67b39d90565144de20c946447e2bbea6
parent486c0373f120881917638072944dbdc6ad08ece8
Merge branch 'dbus-1.4'
NEWS
test/dbus-daemon.c