]> 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: 6a30b45 86e73e4)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 20:14:23 +0000 (16:14 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 20:14:23 +0000 (16:14 -0400)

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