Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 12 Nov 2013 10:55:43 +0000 (10:55 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 12 Nov 2013 10:55:43 +0000 (10:55 +0000)
commit6173ba221a4ed16892cc1b7a794cdac464de2dd2
tree8eb90518a82e878d1cb52cbe05d37595d5b338a2
parent7c86eb023b63d3b35d529509e30552fdaa0dbf7e
parent4f1ed05afc1ed8088404993dedae57cd766cbbb6
Merge branch 'dbus-1.6'
NEWS
bus/activation.c