Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 20 Jun 2013 12:24:41 +0000 (13:24 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 20 Jun 2013 12:24:41 +0000 (13:24 +0100)
commitf2ea8ccc11778639dbbcbb599cb93914c908fc86
tree3b8ce7fb1bc3c56bcf1680f4ff815085d34a8ed3
parent7e1820aa89f6242fdf96e96352e4f27cbd8ccf60
parent931c9663b714d1db0e0dfcf13034e0b83450f3cf
Merge branch 'dbus-1.6'

Conflicts:
NEWS
NEWS