]> 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: 64aca7c 1b6c189)
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 7 Feb 2012 07:47:24 +0000 (02:47 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 7 Feb 2012 07:47:24 +0000 (02:47 -0500)

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