Merge remote-tracking branch 'negres/master'

pde · pde · commit 06d87ad02445 · 2012-09-26T14:03:28.000-07:00
diff --git a/src/chrome/content/rules/BarnesandNoble.xml b/src/chrome/content/rules/BarnesandNoble.xml
@@ -3,7 +3,7 @@
     <target host="*.bn.com" />
 	<target host="barnesandnoble.com" />
 	<target host="*.barnesandnoble.com" />
-		<exclusion pattern="http://www\.barnesandnoble\.com/[sw]/" />
+		<exclusion pattern="http://www\.barnesandnoble\.com/(?:google/ad\?url=|[sw]/)" />
 	<target host="*.imagesbn.com" />
 
 
diff --git a/src/chrome/content/rules/ZeniMax-Media.xml b/src/chrome/content/rules/ZeniMax-Media.xml
@@ -8,6 +8,9 @@
 
 	<securecookie host="^(.*\.)?bethsoft\.com$" name=".*"/>
 
+	<rule from="^https?://cdn\.bethsoft\.com/"
+		to="https://d1bjnur3wbumt5.cloudfront.net/" />
+
 	<rule from="^http://(\w+\.)?bethsoft\.com/"
 		to="https://$1bethsoft.com/"/>
 
