From: Joey Hess <joey@kitenet.net>
Date: Thu, 13 Jan 2011 23:47:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110122~50
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f351c67d2ae86a49cb6b1e6cc755b5c0feedb288?hp=f351c67d2ae86a49cb6b1e6cc755b5c0feedb288

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