projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df75c5b 4adf2e2)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 25 Nov 2009 06:18:56 +0000 (01:18 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 25 Nov 2009 06:18:56 +0000 (01:18 -0500)

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