author Lukas Blakk <>
Mon, 28 Oct 2013 14:51:00 -0700
changeset 167262 fb26ef9a35e1714c0a424af7fa2bc156716e8a34
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merging in version bump NO BUG CLOSED TREE

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: