[Pkg-privacy-commits] [xul-ext-monkeysphere] 249/296: Merge remote branch 'dkg/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 4803075dc3e3e603a0e5d343f75daab2d91a65b3
Merge: b08f228 a826071
Author: Jameson Rollins <jrollins at finestructure.net>
Date:   Sun Nov 14 19:09:15 2010 -0500

    Merge remote branch 'dkg/master'

 Changelog            | 4 +++-
 install.rdf.template | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --cc Changelog
index 3fa02ba,424ea1b..c948a8a
--- a/Changelog
+++ b/Changelog
@@@ -2,10 -2,12 +2,12 @@@ xul-ext-monkeysphere (0.5~pre) upstream
  
    * code cleanup
    * add log_level preference, only honors 'silent' at the moment.
+   * bump MaxVersion from 3.6.* to 4.0.* for firefox/iceweasel (thanks to
+     jaywalk for testing!)
  
-  -- Jameson Rollins <jrollins at finestructure.net>  Tue, 05 Oct 2010 22:46:52 -0400
+  -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Sun, 14 Nov 2010 19:04:49 -0500
  
 -xul-ext-monkeysphere (0.4); urgency=low
 +xul-ext-monkeysphere (0.4); upstream;
  
    * auto-generate install.rdf to ensure proper version numbers.
  

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