From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 23:17:18 +0000 (-0400)
Subject: Merge branch 'themes'
X-Git-Tag: 3.20100623~47
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=184f68efa88d6b8b4763ca18619b25e7d8ae1668;p=ikiwiki.git

Merge branch 'themes'
---

184f68efa88d6b8b4763ca18619b25e7d8ae1668