[gjs: 6/6] Merge branch 'smcv/gjs-debug'

[Philip Chimento <pchimento src gnome org>]

commit 4f46b3487fb377be240ecc7c3096ff4565f8307e
Merge: 67b88a46 6a49dc8e
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Jan 31 20:32:16 2018 -0800

    Merge branch 'smcv/gjs-debug'
    
    https://gitlab.gnome.org/GNOME/gjs/merge_requests/39

 gi/function.cpp |  3 ++-
 gjs/context.cpp | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)
---