edx/edx-ora2 — pull request #544 by wedaly (2014-07-29 13:01:12+00:00)
Title: Clarify naming of Javascript minify task

I get the words "minimize" and "minify" confused. Since the JavaScript needs to be both minified *and* combined, I've changed the make task to simply `make javascript`.

@gradyward @stephensanchez