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

Merge remote branch 'origin/org'
---

7eae0187666c18593fd6ce79fa82f1b153421800