[Pkg-mozext-commits] [greasemonkey] 36/55: Merge branch 'master' into broadcast-script-config

[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 82f484de7c1f0d50238bae492d42cc7f9c7503f4
Merge: 73736ed a516cf9
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Thu Sep 24 10:43:09 2015 -0400

    Merge branch 'master' into broadcast-script-config

 content/addons4-overlay.js |  3 +--
 content/browser.js         | 12 ++++++++----
 content/menucommander.js   | 12 ++++++------
 modules/addons4.js         |  6 ++++--
 modules/script.js          |  8 ++++----
 modules/util/setEditor.js  |  7 ++++++-
 6 files changed, 29 insertions(+), 19 deletions(-)


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