Merge remote-tracking branch 'origin/master'

EFForg · Feb 15, 2014 · 1350ff7 · 1350ff7
2 parents 800b1fb + db8441d
commit 1350ff7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/chrome/content/rules/Give-Kids-the-World.xml b/src/chrome/content/rules/Give-Kids-the-World.xml
@@ -1,4 +1,4 @@
-<ruleset name="Give Kids the World" platform="mixedcontent">
+<ruleset name="Give Kids the World" default_off="Differing HTTP vs HTTPS content (2014-02-05)" platform="mixedcontent">
 	<target host="gktw.org" />
 	<target host="www.gktw.org" />
 	<target host="gktw.com" />