Stanford-Online/edx-platform — pull request #99 by jbau (2014-08-06 01:07:08+00:00)
Title: DO NOT MERGE THIS IS JUST ME TESTING JENKINS AUTO PR RUNS

from origin/master
into origin/rc