[Pkg-mozext-commits] [greasemonkey] 28/41: Merge remote-tracking branch 'janekptacijarabaci/@matchInCludeEditorEditing'

[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 4d5039598c8f929da89477334ebcae5cc1444a80
Merge: e95d814 2934459
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Wed Apr 22 15:55:42 2015 -0400

    Merge remote-tracking branch 'janekptacijarabaci/@matchInCludeEditorEditing'
    
    Fixes #1703

 content/bindings.xml       | 39 ++++++++++++++++++++++++++++++++++++---
 content/config.js          |  1 +
 content/scriptprefs.js     | 19 +++++++++++++++++++
 content/scriptprefs.xul    | 24 ++++++++++++++++++------
 locale/cs/gm-cludes.dtd    |  2 ++
 locale/en-US/gm-cludes.dtd |  2 ++
 modules/script.js          | 30 +++++++++++++++++++++++++++++-
 modules/stats.js           |  1 +
 modules/sync.js            |  5 ++++-
 9 files changed, 112 insertions(+), 11 deletions(-)


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