author Jan de Mooij <>
Thu, 14 Mar 2013 10:50:28 +0100
changeset 127420 301858db6ab500e433ee2072faca8da7f5fa67ec
parent 123252 2e4ea5c2020e854110ae42dd18143eba1c390497
child 125513 97e443115162450609702fc72c99b6d88d8703d6
permissions -rw-r--r--
Merge from mozilla-inbound.

# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at