mozilla-b2g/gaia — pull request #17633 by gasolin (2014-03-26 09:14:15+00:00)
Title: Bug 971458 - [System2] Instantiable AppWindowFactory

Conflicts:
apps/system/js/bootstrap.js
apps/system/test/unit/bootstrap_test.js
build/jshint/xfail.list