Merge remote-tracking branch 'origin/master'

MB · MB · commit 1350ff709468 · 2014-02-15T17:10:20.000Z
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" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<ruleset name="Give Kids the World" platform="mixedcontent">`
	`1`	`+<ruleset name="Give Kids the World" default_off="Differing HTTP vs HTTPS content (2014-02-05)" platform="mixedcontent">`
`2`	`2`	`<target host="gktw.org" />`
`3`	`3`	`<target host="www.gktw.org" />`
`4`	`4`	`<target host="gktw.com" />`