projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cff4201 5acfbb5)
Merge branch 'master' into pedigree
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 14 Jul 2008 17:49:07 +0000 (13:49 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 14 Jul 2008 17:49:07 +0000 (13:49 -0400)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.