projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e0b724 438cb24)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 1 Feb 2010 20:17:13 +0000 (15:17 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 1 Feb 2010 20:17:13 +0000 (15:17 -0500)

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