Merge branch 'dbus-1.10' into dbus-1.10-ci
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 18 May 2016 17:14:16 +0000 (18:14 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 18 May 2016 17:14:16 +0000 (18:14 +0100)
commit5602ef4bf2a06771412fb4ce34e38bf967e018e6
tree4535e35e360e0f53990c3e32034b159b2e26f9cd
parentaa44956ef6b928534e2b93a0ddaaf7b4fbe32651
parent78362cfc62ebc5af8b529048b2e2aec0f977ceeb
Merge branch 'dbus-1.10' into dbus-1.10-ci