author Ehsan Akhgari <>
Fri, 30 Sep 2011 10:13:25 -0400
changeset 77911 743ed92f93320c883523e82a290d8bee70d4893c
parent 1 9b2a99adc05e53cd4010de512f50118594756650
permissions -rw-r--r--
Merge the last green changeset of mozilla-inbound into mozilla-central

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.