author David Anderson <>
Fri, 20 Jul 2012 12:02:04 -0700
changeset 106989 a21ef9ee88f4d0168b073a98cc9c7b9283cf8649
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge from mozilla-central.

Please see the file toolkit/content/license.html for the copyright licensing
conditions attached to this codebase, including copies of the licenses

You are not granted rights or licenses to the trademarks of the
Mozilla Foundation or any party, including without limitation the
Firefox name or logo.

For more information, see: