From: W. Trevor King <wking@tremily.us>
Date: Sun, 13 Jan 2013 12:13:17 +0000 (-0500)
Subject: Merge branch 'org' into wtk
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f428f282c86256fdf2002d86891f7034e1dcace;p=ikiwiki.git

Merge branch 'org' into wtk
---

2f428f282c86256fdf2002d86891f7034e1dcace