Stanford-Online/edx-platform — pull request #70 by jbau (2014-07-09 23:45:26+00:00)
Title: HACK capa timed-test on capa_base.py

Conflicts:
common/lib/xmodule/xmodule/capa_base.py
lms/templates/problem.html

I did the cherry-pick of the hacked timed exam and resolved conflicts.

@jrbl @stvstnfrd