From: David Bremner <bremner@unb.ca>
Date: Mon, 1 Sep 2008 15:12:51 +0000 (-0300)
Subject: Merge branch 'master' into htmlify
X-Git-Tag: 0.4~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/715d587f76b74be9228a9349f25f82cf936a2a11

Merge branch 'master' into htmlify
---

715d587f76b74be9228a9349f25f82cf936a2a11