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

Merge remote branch 'origin/org'
---

2b4d29ba46eee8f2552c9ce898bdb92e584473ff