]> 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: 9faa0f3 ea21db6)
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Fri, 25 Jan 2013 13:47:17 +0000 (08:47 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Fri, 25 Jan 2013 13:47:17 +0000 (08:47 -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.