From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Jul 2010 09:22:20 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100804~26
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a47444fd97d73c756072abe655abf90b591defaa

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

a47444fd97d73c756072abe655abf90b591defaa