[Pkg-mozext-commits] [greasemonkey] 13/26: Merge remote-tracking branch 'janekptacijarabaci/fix_resources'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository greasemonkey.

commit 31091a618581ad75769b8fc682f221f1f4ba3e0d
Merge: c87510d 614756b
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Thu Jan 21 09:14:45 2016 -0500

    Merge remote-tracking branch 'janekptacijarabaci/fix_resources'
    
    Fixes #2341

 modules/scriptProtocol.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/greasemonkey.git