[glib/glib-2-58: 2/2] Merge branch 'cherry-pick-f697f6aa' into 'glib-2-58'

[Iain Lane <iainl src gnome org>]

commit 7086baebe0b6050c38f8b13de1abf10f0d6ea121
Merge: 6a3fb3438 51e7219c5
Author: Iain Lane <iain orangesquash org uk>
Date:   Tue Sep 4 09:58:38 2018 +0000

    Merge branch 'cherry-pick-f697f6aa' into 'glib-2-58'
    
    tests/timer: Skip test_timeval_to_iso8601_overflow if we can't overflow a GTimeVal
    
    See merge request GNOME/glib!301

 glib/tests/timer.c | 6 ++++++
 1 file changed, 6 insertions(+)
---