[Pkg-privacy-commits] [xul-ext-monkeysphere] 185/296: Merge remote 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 a7ffba62c3aa601fd582b5df554ad63167c7ec04
Merge: fe41863 2e72d58
Author: Micah Anderson <micah at riseup.net>
Date:   Sun Mar 21 16:02:48 2010 -0400

    Merge remote branch 'jrollins/debian' into debian

 .gitignore                           |   2 +
 COPYING                              | 676 ++++++++++++++++++++++++++++
 Changelog                            |   6 +
 Makefile                             |  12 +-
 NOTES                                |   8 +
 TODO                                 |   8 -
 chrome/content/monkeysphere.js       | 841 ++++++++++++++++++++---------------
 chrome/content/monkeysphere.xul      |  16 +-
 chrome/locale/en-US/messages         |  25 +-
 debian/changelog                     |  13 +-
 debian/control                       |   6 +-
 debian/rules                         |  13 +-
 debian/xul-ext-monkeysphere.dirs     |   7 +
 debian/xul-ext-monkeysphere.install  |   1 +
 debian/xul-ext-monkeysphere.links    |   1 +
 defaults/preferences/monkeysphere.js |   2 +
 install.rdf                          |   6 +-
 17 files changed, 1220 insertions(+), 423 deletions(-)


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