From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 11 Sep 2009 21:03:41 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/joeyh/ikiwiki
X-Git-Tag: 3.14159265~53^2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5a627f1853b4edcbe38dabcfca37fde477572ef5?hp=-c

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

5a627f1853b4edcbe38dabcfca37fde477572ef5