Merge branch 'wip/lantw/fix-gtestdbus-crash-on-freebsd'769326e1f14cea37724b35e6866765cb7d11be41
commit769326e1f14cea37724b35e6866765cb7d11be41
authorPhilip Withnall <withnall@endlessm.com>
Mon, 20 Aug 2018 10:13:23 +0000 (20 11:13 +0100)
committerPhilip Withnall <withnall@endlessm.com>
Mon, 20 Aug 2018 10:13:23 +0000 (20 11:13 +0100)
treea7cfb223d37a7c3fc0cad78107a0a526b3c2e424
parenta7ffddbaf9c4a9dfb27f64e935008657cfdc99df
parent9147403893fa5aa3167a22ade10dcdae041f0ea7
Merge branch 'wip/lantw/fix-gtestdbus-crash-on-freebsd'

Manually rebased.

https://gitlab.gnome.org/GNOME/glib/merge_requests/251