edx/edx-tim — pull request #10 by wedaly (2014-01-21 20:54:41+00:00)
Title: Update setup.py to handle -e in requirements.txt

Conflict between the last two PRs caused the `setup.py install` command to fail. The setup script pulls in package requirements from `base/requirements.txt`. The new `-e` requirements were causing `setuptools` to fail the installation process.

@stephensanchez