]> 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: 0d5019f 854588d)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 11 Aug 2013 12:58:54 +0000 (14:58 +0200)
committerJoey Hess <joey@kitenet.net>
Sun, 11 Aug 2013 12:58:54 +0000 (14:58 +0200)

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