author Ryan VanderMeulen <>
Thu, 23 Apr 2015 17:22:50 -0400
changeset 240864 2a1ddf08a4b4ee8914e99139efcaa64b11318c0b
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge m-c to inbound. 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: