Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 22 Apr 2013 15:16:03 +0000 (16:16 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 22 Apr 2013 15:16:03 +0000 (16:16 +0100)
commit5f12e6e081d8a881ac712927d1a0e6b7ff7d4cca
treef56d4ee5d4342de90408b463d7866600ec1d7d38
parent7467a410ef74ac121cb4aa75948c580f6ad30d6d
parent6d7782659aff46544bbb9177bf09753fdb454fac
Merge branch 'dbus-1.6'

Conflicts:
NEWS
NEWS