[Pkg-privacy-commits] [xul-ext-monkeysphere] 27/296: 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 xul-ext-monkeysphere.

commit 015b3cc336acfdb805feb119682b9b28781048a3
Merge: 9d0df24 56bd2fd
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

 chrome/content/monkeysphere.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)


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