Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs

Conflicts:
	TODO.cvs

diff --cc TODO.cvs
index e1ae4570a93fcedc1aa2d23e50aefd5110d36dd3,bf92a00ce427409273a8c5842262ef6c8d27478a..13dc99822dc012ba6b31d6fd566b5d9ec3aedf8d
--- 1/TODO.cvs
--- 2/TODO.cvs
+++ b/TODO.cvs
@@@ -1,6 -1,20 +1,4 @@@
- DON'T PUSH BEFORE PULLING AND REBASING!
- 
 -* write test cases:
 -    * web edits can create CVS/foo.mdwn (and think of case-insensitive "cvs/")
 -    * binary file detection
 -    * `cvsps` output format
 -    * `findtimes()`
 -* `File::MimeInfo::default()` wrongly marks some text files `-kb`
 -    * stop doing it
 -    * find and fix existing
 -* instead of reading backwards, write one changeset per file and
 -  `ls | sort -nr | head -100`
 -    * obviates need for File::ReadBackwards
 -* parameterize `cvsps` command
 -* when is `-x` overkill? ever?
 -* `-b HEAD`, always?
 -* use `open()` instead of `system()`
 -* implement the time optimizations
 -* use `cvs_runcvs` everywhere `cvs` is run
 -* set up `log_accum` and `commit_prep` in `ikiwiki-makerepo`
 -    * obviates need for `cvsps`
 -* historyurl overzealously escapes path slashes?
 +* make old tests run in any order
 +* merge old tests into new test subs
 +
 +* more copyright years?