[Pkg-privacy-commits] [xul-ext-monkeysphere] 151/296: Merge branch 'jrollins/debian' 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 9e9a5b1bb0a5f758c5ccbd2c68a9871d9c2cdc4d
Merge: 5a24a64 2629a1f
Author: Micah Anderson <micah at riseup.net>
Date:   Tue Mar 9 10:55:56 2010 -0500

    Merge branch 'jrollins/debian' into debian

 NOTES                                |   8 +
 TODO                                 |   8 -
 changelog                            |   6 +
 chrome/content/monkeysphere.js       | 638 ++++++++++++++++++++---------------
 chrome/content/monkeysphere.xul      |  16 +-
 chrome/locale/en-US/messages         |  25 +-
 defaults/preferences/monkeysphere.js |   2 +
 7 files changed, 400 insertions(+), 303 deletions(-)

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