[gjs: 2/2] Merge branch 'gtk-template-callbacks' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 7a43196ed7b32ccc3bd86146ae04c848d86f5e04
Merge: 1cdb06c7 bcfa6ce7
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Apr 22 04:33:29 2018 +0000

    Merge branch 'gtk-template-callbacks' into 'master'
    
    overrides: initial commit of Gtk template callbacks
    
    See merge request GNOME/gjs!124

 installed-tests/js/complex.ui |  1 +
 installed-tests/js/testGtk.js | 16 +++++++++++++++-
 modules/overrides/Gtk.js      | 14 ++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
---