From: W. Trevor King <wking@drexel.edu>
Date: Wed, 13 Oct 2010 21:27:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://einstein/~/public_html/code/git/ikiwiki
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5dcbc0cf8eb3f000662b21d178982353c63584b4;p=ikiwiki.git

Merge branch 'master' of ssh://einstein/~/public_html/code/git/ikiwiki
---

5dcbc0cf8eb3f000662b21d178982353c63584b4