[Pkg-privacy-commits] [xul-ext-monkeysphere] 274/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 0b1f4c55fc006ba583d82259b5babe468441af69
Merge: b3afc3d 975965f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Mar 11 18:17:30 2011 -0500

    Merge branch 'master' into debian

 Changelog                                   |  8 ++++++++
 chrome/content/monkeysphere.xul             |  1 -
 chrome/locale/pt-BR/help.dtd                | 16 ++++++++++++++++
 chrome/locale/pt-BR/messages                | 18 ++++++++++++++++++
 chrome/locale/{en-US => pt-BR}/messages.dtd |  8 ++++----
 install.rdf.template                        |  2 +-
 6 files changed, 47 insertions(+), 6 deletions(-)

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