From: W. Trevor King <wking@drexel.edu>
Date: Thu, 18 Feb 2010 20:51:49 +0000 (-0500)
Subject: Merge branch 'master' of yang:./rsrch/notes/thesis
X-Git-Tag: v1.0~456
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8d3877a188c860d3b80fb5c54a896c964d63a5a;p=thesis.git

Merge branch 'master' of yang:./rsrch/notes/thesis
---

d8d3877a188c860d3b80fb5c54a896c964d63a5a