author Ehsan Akhgari <>
Tue, 24 Apr 2012 21:29:44 -0400
changeset 92366 e1acc0e92a4087ad36b995baa824fb4a1f5e47a5
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge mozilla-central into mozilla-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: