author Wes Kocher <>
Thu, 26 Mar 2015 17:22:05 -0700
changeset 264746 e046475a75cb2dbcce6ebc3cd012efd7385a2142
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge fx-team to m-c a=merge CLOSED TREE

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: