author Ryan VanderMeulen <>
Wed, 30 Apr 2014 16:47:13 -0400
changeset 181581 296435e7eeb62ca6735784e76867d7ddc6009292
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge m-c to b2g-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: