From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 00:02:43 +0000 (-0400)
Subject: Merge branch 'master' into dependency-types
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/76746c5fe6a8e851b971c8222a4929fe3be7f60a

Merge branch 'master' into dependency-types
---

76746c5fe6a8e851b971c8222a4929fe3be7f60a