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

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

ec36761335aff409a76bfa37a708b2347281091f