tree a7cfb223d37a7c3fc0cad78107a0a526b3c2e424
parent a7ffddbaf9c4a9dfb27f64e935008657cfdc99df
parent 9147403893fa5aa3167a22ade10dcdae041f0ea7
author Philip Withnall <withnall@endlessm.com> 1534760003 +0100
committer Philip Withnall <withnall@endlessm.com> 1534760003 +0100

Merge branch 'wip/lantw/fix-gtestdbus-crash-on-freebsd'

Manually rebased.

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