Porting Blockchain.info rule from master to stable
Merge pull request #711 from vedran6/stable

Porting Blockchain.info rule from master to stable
Merge remote-tracking branch 'github/stable' into 4.0
Merge remote-tracking branch 'efforg/4.0' into 4.0
[Parallels] Force www

Conflicts:
	src/chrome/content/rules/Parallels.xml
Chrome version 2014.11.25

Conflicts:
	chromium/manifest.json
Merge branch '4.0' of github.com:EFForg/https-everywhere into 4.0
[GoogleServices] newspaper exclusion needs to apply on CCtlds too

Eg: http://news.google.com.au/newspapers?nid=MDQ-9Oe3GGUC&dat=19521208&printsec=frontpage&hl=en
[Flickr] Add comments

Conflicts:
	src/chrome/content/rules/Flickr.xml
[Flickr] Exclude current_identity cookie

Fixes https://github.com/EFForg/https-everywhere/issues/239
Merge remote-tracking branch 'efforg/4.0' into 4.0