projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7399b07 6836070)
Merge commit 'intrigeri/master' into slop
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 00:06:48 +0000 (20:06 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 00:06:48 +0000 (20:06 -0400)

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