Merge remote-tracking branch 'yan/3.0' into 3.0

diracdeltas · diracdeltas · commit 521aea136085 · 2013-12-09T17:57:43.000-08:00
diff --git a/src/chrome/content/rules/Brightcove.xml b/src/chrome/content/rules/Brightcove.xml
@@ -18,8 +18,8 @@
 		<!--
 			https://mail1.eff.org/pipermail/https-everywhere-rules/2013-May/001587.html
 													-->
-		<exclusion pattern="^http://admin\.brightcove\.com/viewer/us20[\d\.]+/BrightcoveBootloader\.swf(?:\?|$)" />
 
+		<exclusion pattern="^http://admin\.brightcove\.com/viewer/.+\.swf(?:\?|$)" />
 
 	<!--	admin:	Akamai	-->
 	<rule from="^https?://s?admin\.brightcove\.com/"
