Merge branch 'master' into StevenRoddis-googleuc

jsha · jsha · commit 41cf3b8f77f5 · 2015-03-09T15:28:12.000-07:00
Conflicts:
	https-everywhere-checker
diff --git a/https-everywhere-checker b/https-everywhere-checker
@@ -1 +1 @@
-Subproject commit 1b2d8cc64f5ea267ab6ea60b99d0eb94219ef2be
+Subproject commit 0b2980d46c7fd87ea9b529f5ffb4ad545ef52e18
diff --git a/src/chrome/content/rules/MyFBO.com.xml b/src/chrome/content/rules/MyFBO.com.xml
@@ -0,0 +1,9 @@
+<ruleset name="MyFBO">
+	<target host="myfbo.com" />
+	<target host="*.myfbo.com" />
+	
+	<securecookie host="^(?:.*\.)?myfbo\.com$" name=".+" />
+
+	<rule from="^http:"
+		to="https:" />
+</ruleset>
