Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 14 Nov 2014 19:14:22 +0000 (19:14 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 14 Nov 2014 19:14:22 +0000 (19:14 +0000)
commit3630959879895fe93b5bec084102aaca9c7c0c05
treebeb6a8f4cd7555c736f218d04a4f856c2b0eac2f
parent72d7658740a05cef17376331abed036b651c51ac
parent34e5fdee4e5e43b8563e6e02b8bdc94c083b2f47
Merge branch 'dbus-1.8'