[Pkg-privacy-commits] [xul-ext-monkeysphere] 161/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 64446bf1c2a06399fc09209b195a78959f2b5747
Merge: 399ffff dc9ac51
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Mar 9 13:30:39 2010 -0500

    Merge branch 'master' into debian

 .gitattributes         | 4 ++++
 .gitignore             | 2 ++
 changelog => Changelog | 0
 Makefile               | 4 +++-
 4 files changed, 9 insertions(+), 1 deletion(-)

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