edx/edx-platform — pull request #3042 by flowerhack (2014-03-24 18:21:37+00:00)
Title: Fix tests around to_python

Conflicts:
lms/djangoapps/bulk_email/tests/test_err_handling.py