[Pkg-privacy-commits] [xul-ext-monkeysphere] 26/296: Merge remote branch 'jrollins/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 26ed64f59bb5199666139fd4f61ed9ed26356e39
Merge: 56bd2fd 9d0df24
Author: mike castleman <m at mlcastle.net>
Date:   Sat Jan 9 17:30:07 2010 -0500

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

 chrome/content/monkeysphere.js | 178 ++++++++++++++++++++++++++---------------
 1 file changed, 114 insertions(+), 64 deletions(-)


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