From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Wed, 9 Sep 2009 18:44:52 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/joeyh/ikiwiki
X-Git-Tag: 3.14159265~74^2~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5f44dd8e7762827753c02dcd78d663c0fd9554b3?ds=inline;hp=--cc

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

5f44dd8e7762827753c02dcd78d663c0fd9554b3