openwebwork/webwork2 — pull request #390 by goehle (2014-05-19 03:30:26+00:00)
Title: Fix Conflicts and Merge release/2.9 into develop

The pull request for release 2.9 into develop doesn't merge cleanly. This branch fixes the conflicts.

P.S. It would be nice if I could show exactly what the conflicts were and how I fixed them, but I don't know how. In this case there was one very minor conflict.