From: Joey Hess <joey@kitenet.net>
Date: Tue, 5 Oct 2010 15:29:44 +0000 (-0400)
Subject: Merge branch 'master' into revert
X-Git-Tag: 3.20101019~19^2~22
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/06b28dddecce8d27c0b556c883b8721aee1d3dc9?hp=06b28dddecce8d27c0b556c883b8721aee1d3dc9

Merge branch 'master' into revert

Conflicts:
	doc/todo/web_reversion.mdwn
---