From: Joey Hess <joey@kitenet.net>
Date: Wed, 6 Oct 2010 18:36:13 +0000 (-0400)
Subject: Merge branch 'master' into revert
X-Git-Tag: 3.20101019~19^2~21
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9366c5efd38a4c1c7f5d4506982b9bda20eb9ada?ds=inline;hp=9366c5efd38a4c1c7f5d4506982b9bda20eb9ada

Merge branch 'master' into revert
---