[Pkg-privacy-commits] [xul-ext-monkeysphere] 194/296: Merge remote branch 'dkg/master'

[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 b2a2d5404e47ff6f332756f5446099bc1e8c6110
Merge: 0f0f37f 4502255
Author: Micah Anderson <micah at riseup.net>
Date:   Mon Apr 5 09:50:04 2010 -0400

    Merge remote branch 'dkg/master'
    
    Conflicts:
    	install.rdf

 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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