edx/edx-platform — pull request #4769 by chrisndodge (2014-08-11 00:35:33+00:00)
Title: Updated CSV download of coupon codes to include Invoice Information

Conflicts:

lms/djangoapps/instructor/tests/test_api.py