Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 16 Sep 2013 13:59:01 +0000 (14:59 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 16 Sep 2013 13:59:01 +0000 (14:59 +0100)
commita61cfccf3111b6753673be172b43792a68f1a044
treed154b820e8371b49b34134b179f001da3e972922
parent52b6106a3336ba092b5be837b3499b2a60bc8d5f
parent3b85dfcf77dc8fe40c8ab98163725d29e1d63706
Merge branch 'dbus-1.6'

Conflicts:
NEWS
NEWS