projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ed0a63 35668b8)
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 patch | diff1 | diff2 | blob | history

diff --cc IkiWiki.pm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.