From: W. Trevor King <wking@drexel.edu>
Date: Wed, 13 Oct 2010 19:38:31 +0000 (-0400)
Subject: Merge remote branch 'origin/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4bb8a2fe46cfbeb8214c27d037e742406ab6558d;p=blog.git

Merge remote branch 'origin/master'
---

4bb8a2fe46cfbeb8214c27d037e742406ab6558d