mozilla-b2g/gaia — pull request #24040 by yurenju (2014-09-15 08:52:47+00:00)
Title: Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript...

... file r=gduan

Conflicts:
Makefile