]> 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: 3a560b2 5375793)
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 29 Nov 2012 22:33:14 +0000 (17:33 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 29 Nov 2012 22:33:14 +0000 (17:33 -0500)
1  2 
IkiWiki/Plugin/cvs.pm patch | diff1 | diff2 | blob | history

diff --cc IkiWiki/Plugin/cvs.pm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.