From: Joey Hess <joey@kitenet.net>
Date: Mon, 27 Sep 2010 02:27:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100926~4
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e789cb9c84ba22570de18ff530c428c6fbe56e77?hp=e789cb9c84ba22570de18ff530c428c6fbe56e77

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