]> 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: b24235c 9a75c8a)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 3 Dec 2013 16:45:18 +0000 (12:45 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 3 Dec 2013 16:45:18 +0000 (12:45 -0400)

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