]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'intrigeri/pedigree'
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 16 Jul 2008 21:31:15 +0000 (17:31 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 16 Jul 2008 21:31:15 +0000 (17:31 -0400)
1  2 
IkiWiki.pm

diff --cc IkiWiki.pm
Simple merge