author Ryan VanderMeulen <>
Tue, 11 Feb 2014 08:41:45 -0500
changeset 185247 e831c370a8fee814fb44a81e666cc55570e5dd4b
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge m-c to inbound.

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: