Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 15 Sep 2014 10:51:26 +0000 (11:51 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 15 Sep 2014 10:51:26 +0000 (11:51 +0100)
1  2 
NEWS
configure.ac

diff --cc NEWS
Simple merge
diff --cc configure.ac
Simple merge