From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 19:06:57 +0000 (-0500)
Subject: Merge branch 'master' into comments
X-Git-Tag: 2.71~78
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/613a54a3cb48ff0bd00c02d44304ce08b6725343?ds=sidebyside;hp=--cc

Merge branch 'master' into comments
---

613a54a3cb48ff0bd00c02d44304ce08b6725343