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

Merge remote branch 'origin/org'
---

ccc8931fd9f5da5b8a5ba3d62d28062bc296770a