[Pkg-privacy-commits] [xul-ext-monkeysphere] 239/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 e7c54ca68f66e283874eb6b1abcc6a43ff15ec6c
Merge: ff14463 5cbd7e6
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed May 5 13:03:42 2010 -0400

    Merge branch 'master' into debian

 Changelog                           | 6 ++++++
 Makefile                            | 6 ++++++
 install.rdf => install.rdf.template | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

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