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

Conflicts:
	TODO.cvs

diff --git a/TODO.cvs b/TODO.cvs
index e1ae4570a93fcedc1aa2d23e50aefd5110d36dd3..13dc99822dc012ba6b31d6fd566b5d9ec3aedf8d 100644 (file)
--- a/TODO.cvs
+++ b/TODO.cvs
@@ -1,5 +1,3 @@
-DON'T PUSH BEFORE PULLING AND REBASING!
-
 * make old tests run in any order
 * merge old tests into new test subs