[gjs: 2/2] Merge branch 'gbsneto/fix-profiler-js60' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 710017d9a1c21a042d0e398b8ab06b2513315e03
Merge: c3e21cde bf9e5da2
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Sep 16 21:14:39 2018 +0000

    Merge branch 'gbsneto/fix-profiler-js60' into 'master'
    
    Fix GJS profiler with MozJS 60
    
    See merge request GNOME/gjs!230

 gjs/profiler.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)
---