]> 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: 588ff65 583cfab)
Merge remote branch 'remotes/origin/html' into ignore ignore
authorJoey Hess <joey@kitenet.net>
Sun, 9 May 2010 03:04:34 +0000 (23:04 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 9 May 2010 03:04:34 +0000 (23:04 -0400)

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