Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Apr 2013 12:00:22 +0000 (13:00 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Apr 2013 12:00:22 +0000 (13:00 +0100)
commit3b1ad7f7c583fbb80c5a084c78b926ecaaca0aa9
tree08ea4ccea83326749159fa3eecceaebc40e23504
parent71fc71fe5552c8292564ea0662b30fd535d8565f
parent540e5692e07d48fb41a4e977e0c9078fa19bd677
Merge branch 'dbus-1.6'

Conflicts:
NEWS
configure.ac
NEWS
configure.ac