Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 8 Apr 2011 14:23:17 +0000 (15:23 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 8 Apr 2011 14:23:17 +0000 (15:23 +0100)
commitc4b76acc6bce04507b04b210326d4a3841dbe2d8
tree0af146778f2e81255ae8a692ae6a7675fb403cab
parent74072479a05dbf9208a5f92495e7eb32f471428c
parent4a0e7d29a491a865d02063e6879bf8d779e1452a
Merge branch 'dbus-1.4'

Conflicts:
NEWS
NEWS
configure.ac
doc/dbus-specification.xml