[Pkg-mozext-commits] [greasemonkey] 06/19: Merge remote-tracking branch 'janekptacijarabaci/unableToEditScripts'

[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 e2533ea8427981d4350dc9f3a57a5b267964cb20
Merge: 8b2baa1 f296b04
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Mon Mar 16 10:44:17 2015 -0400

    Merge remote-tracking branch 'janekptacijarabaci/unableToEditScripts'
    
    Refs #2073

 content/scriptprefs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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