]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa67a17 daa8c8e)
Merge branch 'master'
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 7 Jul 2008 17:17:12 +0000 (13:17 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 7 Jul 2008 17:18:10 +0000 (13:18 -0400)

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