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

Merge remote branch 'origin/master'
---

4e8489ade8076372a89096ae0998ea5a409a9cd4