Merge branch 'master' into xulmus

common/content/liberator.js

@@ -1229,7 +1229,12 @@ const liberator = (function () //{{{
             config.features.push(getPlatformFeature());
             config.defaults = config.defaults || {};
             config.guioptions = config.guioptions || {};
-            config.browserModes = config.browserModes || [modes.NORMAL];
+
+            // -> we can't use this, since config.browserModes might already be defined as a getter-only
+            // TODO: also change the other config.* defaults?
+            // config.browserModes = config.browserModes || [modes.NORMAL];
+            if (!config.browserModes)
+                 config.browserModes = [modes.NORMAL];
             config.mailModes = config.mailModes || [modes.NORMAL];
             // TODO: suitable defaults?
             //config.mainWidget

muttator/install.rdf

@@ -20,7 +20,7 @@
 	    <Description>
 		<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
 		<em:minVersion>3.0b2pre</em:minVersion>
-		<em:maxVersion>3.0b2</em:maxVersion>
+		<em:maxVersion>3.0b3</em:maxVersion>
 	    </Description>
 	</em:targetApplication>
 

vimperator/Donors

@@ -2,6 +2,13 @@ Continuous donations:
 * Daniel Bainton (web hosting)
 
 2009:
+* Christoph Petzold
+* Bjoern Steinbrink
+* Erlend Hamberg
+* Fabien Benetou
+* Arvin Moezzi
+* Calogero Lo Leggio
+* Sapan Bhatia
 * Gavin Sinclair
 * Stephen Borchert
 * Convolution