]> 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: 4b3ce9d e74bb57)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 3 Mar 2012 21:34:46 +0000 (17:34 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 3 Mar 2012 21:34:46 +0000 (17:34 -0400)

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