From: W. Trevor King <wking@drexel.edu>
Date: Thu, 13 Jan 2011 13:16:28 +0000 (-0500)
Subject: Merge remote branch 'public/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=26752b5b6ac3f517aa80f4b30a23d1191ead21ad;p=course.git

Merge remote branch 'public/master'
---

26752b5b6ac3f517aa80f4b30a23d1191ead21ad