[Pkg-privacy-commits] [xul-ext-monkeysphere] 293/296: Merge branch 'master' into debian

[Ximin Luo]

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

infinity0 pushed a commit to branch debian
in repository xul-ext-monkeysphere.

commit 4991aa377773bb9a5aebde015929ba3e34ac10b7
Merge: 749647f 81b2b7c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Sep 20 01:32:03 2013 -0400

    Merge branch 'master' into debian

 Changelog                |  6 +++++
 install.rdf.template     |  2 +-
 modules/monkeysphere.jsm | 59 +++++++++++++++++++++++-------------------------
 3 files changed, 35 insertions(+), 32 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/xul-ext-monkeysphere.git