From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 16 Jul 2008 21:31:15 +0000 (-0400)
Subject: Merge commit 'intrigeri/pedigree'
X-Git-Tag: 2.54~70
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=2c05a34be17c805d929f0ad563acf857eba1d46b

Merge commit 'intrigeri/pedigree'
---

2c05a34be17c805d929f0ad563acf857eba1d46b