From: Joey Hess <joey@kitenet.net>
Date: Wed, 2 Feb 2011 01:08:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110225~95
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9ed779b746de86b92a1c08f1b2b4196d42149e55?ds=sidebyside;hp=9ed779b746de86b92a1c08f1b2b4196d42149e55

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