[Pkg-mozext-commits] [greasemonkey] 25/45: Merge branch 'master' of github.com:greasemonkey/greasemonkey

[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 1984367ff09cd68d64265e6a395103accc741ce3
Merge: b905bdc fa96791
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Thu Oct 2 12:13:42 2014 -0400

    Merge branch 'master' of github.com:greasemonkey/greasemonkey

 modules/miscapis.js     |  4 ++--
 modules/script.js       | 24 ++++++++++++------------
 modules/util/timeout.js | 35 +++++++++++++++++------------------
 3 files changed, 31 insertions(+), 32 deletions(-)

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