From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 11 Jul 2009 19:52:51 +0000 (-0400)
Subject: Merge commit 'e12b7f5e54730325c751a889ed2e08580b5ef6ba'
X-Git-Tag: 3.14159~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=42fcafa57d50b3859ab55443e54f446d662ef157;p=ikiwiki.git

Merge commit 'e12b7f5e54730325c751a889ed2e08580b5ef6ba'
---

42fcafa57d50b3859ab55443e54f446d662ef157