From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 4 Sep 2009 00:24:42 +0000 (-0500)
Subject: Merge branch 'master' of git://github.com/joeyh/ikiwiki
X-Git-Tag: 3.14159265~76^2~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1888464a0d9de9cf4ac40c298924018437758aa2?ds=sidebyside

Merge branch 'master' of git://github.com/joeyh/ikiwiki
---

1888464a0d9de9cf4ac40c298924018437758aa2