From: W. Trevor King <wking@drexel.edu>
Date: Tue, 5 Oct 2010 12:39:28 +0000 (-0400)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38a0c4bbe9d95cb4c13cea0e74e4498f8b4b51e3;p=ikiwiki.git

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

38a0c4bbe9d95cb4c13cea0e74e4498f8b4b51e3