projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5599a5b 872e742)
Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 18:30:08 +0000 (14:30 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 18:30:08 +0000 (14:30 -0400)

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