projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 8a56df5 b28323e)
Merge branch 'master' into templatemove
authorJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 04:47:54 +0000 (00:47 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 04:47:54 +0000 (00:47 -0400)

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