From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 23 Oct 2008 18:09:01 +0000 (-0400)
Subject: Merge branch 'master' into git-anon
X-Git-Tag: 2.68~104
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/62962a470d48dd14ebcd39f1de37504abd2f77b5

Merge branch 'master' into git-anon
---

62962a470d48dd14ebcd39f1de37504abd2f77b5