[gjs: 5/5] Merge branch 'master' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit aa93ab21133808173cd7abd588a341def029764b
Merge: 0cab726f 67f949fa
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Apr 17 05:33:59 2018 +0000

    Merge branch 'master' into 'master'
    
    Fix ARGV encoding issues.
    
    Closes #22
    
    See merge request GNOME/gjs!108

 Makefile-test.am                           | 1 +
 gjs/jsapi-util.cpp                         | 3 ++-
 installed-tests/scripts/testCommandLine.sh | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
---