[Pkg-privacy-commits] [msva-perl] 28/356: Merge remote branch 'mlcastle/master'

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository msva-perl.

commit c94f45a24183a69af36dd732e73009d5d09c8d07
Merge: d229e51 948c6a0
Author: Jameson Rollins <jrollins at finestructure.net>
Date:   Sat Jan 9 17:34:33 2010 -0500

    Merge remote branch 'mlcastle/master'
    
    Conflicts:
    	xul-ext/chrome/content/monkeysphere.js


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/msva-perl.git