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

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

31476bf45c413083b718385a2d61406827609b9e