From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 22:14:58 +0000 (-0400)
Subject: Merge commit 'schmonz/master'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/4a7189965f2831e0c841182902ecae3e53f4af5f

Merge commit 'schmonz/master'
---

4a7189965f2831e0c841182902ecae3e53f4af5f