]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sun, 22 Jan 2012 15:53:45 +0000 (10:53 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sun, 22 Jan 2012 15:53:45 +0000 (10:53 -0500)
commitc74571c7582b7ce3111841a0229f84f7059711aa
tree4fe9df91d016c5192b858783d498cbfab34df80c
parentc1bbff4bfbccada1911c68ad8a43876440015974
parent0b22579368f3f98844e674921f1dc0067ce30ccf
Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs

Conflicts:
TODO.cvs
t/cvs.t