From: Joey Hess <joey@kitenet.net>
Date: Tue, 25 Jan 2011 19:46:37 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110225~115
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c4283919acbd138776751e83d79c96d55703f4eb?hp=c4283919acbd138776751e83d79c96d55703f4eb

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