mozilla/butter — pull request #1612 by bl4de (2013-03-25 22:56:18+00:00)
Title: [t3252 Adding media clips without a protocol shouldn't hang]

Sorry for all of these 12 commits - my cherry-picks all failed and i really don't know, why :/