commit d716d11ec10af4c3a04ae68a85cf16f675a44f8a Merge: b05e243 d8e36b1 Author: Mike Perry mikeperry-git@fscked.org Date: Wed Aug 1 14:31:28 2012 -0700

Merge branch 'maint-2.3'

...0-Add-a-redirect-API-for-HTTPS-Everywhere.patch | 346 ++++++++ ...solate-the-Image-Cache-per-url-bar-domain.patch | 904 ++++++++++++++++++++ 2 files changed, 1250 insertions(+), 0 deletions(-)