author Ryan VanderMeulen <>
Wed, 18 May 2016 12:02:42 -0400
changeset 297935 c4449eab07d39e20ea315603f1b1863eeed7dcfe
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge inbound 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: