author Ryan VanderMeulen <>
Mon, 22 Apr 2013 21:15:00 -0400
changeset 129468 f59811fe0fb3d303fd20abc4e10432488c3d3db5
parent 1 9b2a99adc05e53cd4010de512f50118594756650
permissions -rw-r--r--
Merge birch 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.