From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 31 May 2008 18:37:27 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.49~45
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/cc26a499253b5a0458924992f70678b81811ec70

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

cc26a499253b5a0458924992f70678b81811ec70