From: W. Trevor King <wking@drexel.edu>
Date: Wed, 11 May 2011 16:14:32 +0000 (-0400)
Subject: Merge branch 'master' of /home/wking/notes/ikiwiki
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44a682188e3d189172e534b48c0555926a0e67ed;p=blog.git

Merge branch 'master' of /home/wking/notes/ikiwiki
---

44a682188e3d189172e534b48c0555926a0e67ed