Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 5 Sep 2013 12:12:36 +0000 (13:12 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 5 Sep 2013 12:12:36 +0000 (13:12 +0100)
commitf8e180476f1b9f8d0149542b740b577169863cf8
treee86661b9a79012525e6100fa309f778e70b9c854
parent7d8895e4f49c78d6acb2486250753fbeeae6a610
parentad5b3128ba219c895ee084eb027a296b207df16b
Merge branch 'dbus-1.6'

Conflicts:
NEWS
tools/run-with-tmp-session-bus.sh