edx/edx-platform — pull request #6205 by jmclaus (2014-12-09 21:21:02+00:00)
Title: Combine require config from master and feature/edxnotes.

@polesye @tymofij @olmar This will be needed the next time feature/edxnotes will be rebased on master. Instead of having it as an obscure conflict resolution, lets just merge this beforehand. Please review.