From: W. Trevor King <wking@drexel.edu>
Date: Wed, 6 Oct 2010 13:35:17 +0000 (-0400)
Subject: Merge remote branch 'origin/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e59632e4c8247f32f94178fc3a24c643d5c62e0a;p=ikiwiki.git

Merge remote branch 'origin/master'
---

e59632e4c8247f32f94178fc3a24c643d5c62e0a