From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 4 Jun 2008 04:38:43 +0000 (-0400)
Subject: Merge branch 'master' into xapian
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/46f7dcb362da5d043c758453384a447f0360462c

Merge branch 'master' into xapian
---

46f7dcb362da5d043c758453384a447f0360462c