From: W. Trevor King <wking@drexel.edu>
Date: Mon, 4 Oct 2010 17:31:28 +0000 (-0400)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64bc9f0aaaa3bea79a6749b0e2d6fd4db8819bb1;p=ikiwiki.git

Merge branch 'master' of git://git.ikiwiki.info
---

64bc9f0aaaa3bea79a6749b0e2d6fd4db8819bb1