mozilla/addon-sdk — pull request #935 by erikvold (2013-04-12 04:40:17+00:00)
Title: Bug 859009: URL is valid type for panel.contentURL

(cherry picked from commit cd5bd30c99ac4050e735344d2b3cfb3fae82af1a)

Conflicts:
lib/sdk/content/loader.js