From: Joey Hess <joey@kitenet.net>
Date: Thu, 16 Dec 2010 18:14:00 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101231~64
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/06f4532f3832924d28da535c2caccd6858d15018?ds=inline;hp=06f4532f3832924d28da535c2caccd6858d15018

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