Merge.

--HG--
branch : testing

vimperator/AUTHORS

@@ -2,9 +2,6 @@ Main developer/Project founder:
   * Martin Stubenschrott (stubenschrott@vimperator.org)
 
 Developers:
-  * Doug Kearns (dougkearns@gmail.com)
-  * Tim Hammerquist (penryu@gmail.com)
-  * Konstantin Stepanov (milezv@yandex.ru)
   * Kris Maglione
   * Ted Pavlic <ted@tedpavlic.com>
   * anekos <anekos@snca.net>
@@ -16,6 +13,9 @@ Inactive/former developers:
   * Viktor Kojouharov (Виктор Кожухаров)
   * Marco Candrian (mac@calmar.ws)
   * Daniel Bainton (dpb .AT. driftaway .DOT. org)
+  * Doug Kearns (dougkearns@gmail.com)
+  * Konstantin Stepanov (milezv@yandex.ru)
+  * Tim Hammerquist (penryu@gmail.com)
 
 Patches (in no special order):
   * Ruud Grosmann ('followhints' option)

vimperator/NEWS

@@ -10,6 +10,7 @@
     * Asciidoc is no longer for building
     * Remove [c]:edit[c], [c]:tabedit[c], and [c]:winedit[c]
     * Add 'jsdebugger' option - switch on/off javascript debugger service
+    * Add "addons", "downloads", "extoptions" and "help" to the 'activate' option.
 
 2009-10-28:
     * version 2.2

vimperator/install.rdf

@@ -19,7 +19,7 @@
             <Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>3.5</em:minVersion>
-                <em:maxVersion>3.6b3pre</em:maxVersion>
+                <em:maxVersion>4.0</em:maxVersion>
             </Description>
         </em:targetApplication>
     </Description>