openwebwork/webwork2 — pull request #275 by goehle (2014-01-08 01:54:33+00:00)
Title: Master into Develop

This cleans up a bit of conflict between master and develop