author Ryan VanderMeulen <>
Fri, 06 Dec 2013 15:56:46 -0500
changeset 173921 79d1a5a93b64fe467beb7a4897cc680d2f6b50d4
parent 1 9b2a99adc05e53cd4010de512f50118594756650
permissions -rw-r--r--
Merge b2g-inbound to m-c.

Please see the file ../toolkit/content/license.html for the copyright 
licensing conditions attached to this codebase, including copies of the
licenses concerned.

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.