From: W. Trevor King <wking@drexel.edu>
Date: Tue, 5 Oct 2010 13:39:03 +0000 (-0400)
Subject: Merge remote branch 'public/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5929d334e94553bf2df1fdca26783566e24657c8;p=ikiwiki.git

Merge remote branch 'public/master'
---

5929d334e94553bf2df1fdca26783566e24657c8