[Pkg-privacy-commits] [xul-ext-monkeysphere] 180/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 1bf3257d9d1610cca4b3f46b70ace823578db92f
Merge: 601c99d c790116
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Mar 12 02:57:08 2010 -0500

    Merge branch 'master' into debian

 COPYING                        | 676 ++++++++++++++++++++++++++++++++++++++++
 Makefile                       |   2 +-
 chrome/content/monkeysphere.js | 691 +++++++++++++++++++++--------------------
 3 files changed, 1028 insertions(+), 341 deletions(-)

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