From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 19:24:35 +0000 (-0500)
Subject: Merge branch 'master' into comments
X-Git-Tag: 2.71~92
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/07c9cddb50856d8f94c9618187227027a27fe4c8?ds=sidebyside;hp=-c

Merge branch 'master' into comments
---

07c9cddb50856d8f94c9618187227027a27fe4c8