From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 15 Mar 2008 16:36:13 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~126
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/91142c86adcbb2cddd0e3dc7a38afa8522624ad8?ds=inline;hp=--cc

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

91142c86adcbb2cddd0e3dc7a38afa8522624ad8