[Pkg-mozext-commits] [ubiquity-extension] 02/06: Merge tag 'upstream/0.6.4_pre20141206'

[Gabriele Giacone]

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

gg0-guest pushed a commit to branch master
in repository ubiquity-extension.

commit 3b274564e018abbf534bf817b78b68c26bfc7a7f
Merge: 4685c83 31bcca3
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Dec 6 04:11:39 2014 +0100

    Merge tag 'upstream/0.6.4_pre20141206'
    
    Upstream version 0.6.4~pre20141206

 builtin-feeds/builtincmds.js   |  13 ++++
 chrome/content/header.js       |   4 +-
 feed-parts/footer/final.js     |   1 +
 install.rdf                    |   4 +-
 modules/cmdutils.js            |   7 ++-
 modules/codesource.js          |   6 +-
 modules/default_feed_plugin.js |   2 +-
 modules/feedmanager.js         |   2 +-
 modules/nountypes.js           |   2 +-
 modules/nounutils.js           |   2 +-
 modules/parser/new/parser.js   |   7 +--
 modules/setup.js               |   9 +--
 modules/skin_feed_plugin.js    |   4 +-
 modules/utils.js               |  13 +---
 modules/webjsm.js              |  12 ++--
 standard-feeds/calendar.html   |  11 ----
 standard-feeds/calendar.js     | 137 -----------------------------------------
 standard-feeds/general.js      |   1 +
 standard-feeds/search.xhtml    |  10 +--
 19 files changed, 53 insertions(+), 194 deletions(-)

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