From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 17:28:31 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100515~63^2~29
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/30ac000b5ac53822e5548e314842f036f96294a9?ds=inline;hp=-c

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

30ac000b5ac53822e5548e314842f036f96294a9