mozilla-b2g/gaia — pull request #17995 by sfoster (2014-04-04 21:49:24+00:00)
Title: Revert "Merge pull request #16262 from benfrancis/959694-master"

Fixed merge conflicts in apps/system/js/bootstrap.js