Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 20 Feb 2012 11:32:44 +0000 (11:32 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 20 Feb 2012 11:32:44 +0000 (11:32 +0000)
commit1eba10ad373a0ada9d36f29d0024fc8c46911163
tree2c3df4a4f6a2c5d578f36a59880600d7269640b4
parent41116034b2aff2ab062d4f3476333edbdb80580c
parent302c35b03f682644253f504ccf885a972f645e0d
Merge branch 'dbus-1.4'

Conflicts:
NEWS
NEWS