From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sun, 22 Jan 2012 07:40:38 +0000 (-0500)
Subject: Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
X-Git-Tag: 3.20120202~26^2~9^2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0b22579368f3f98844e674921f1dc0067ce30ccf?hp=97016a00618138bf9571f2c4c3a66d5f2f51e1a7

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

Conflicts:
	TODO.cvs
---

diff --git a/TODO.cvs b/TODO.cvs
index e1ae4570a..13dc99822 100644
--- 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