[gjs: 2/2] Merge branch 'wip/3v1n0/use-timeout-seconds' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 9a7997e93ae38c530894035dbfa15651644bd405
Merge: b77ca6d8 0fb9228d
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Oct 8 20:48:04 2018 +0000

    Merge branch 'wip/3v1n0/use-timeout-seconds' into 'master'
    
    context: use timeout with seconds to schedule a gc trigger
    
    See merge request GNOME/gjs!239

 gjs/context.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
---