From: W. Trevor King <wking@drexel.edu>
Date: Thu, 30 Sep 2010 14:36:48 +0000 (-0400)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b9ef40a521b649eb85c63b3183b29e39f16299c9;p=ikiwiki.git

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

b9ef40a521b649eb85c63b3183b29e39f16299c9