From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Jul 2010 17:25:03 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100722~25
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c9dd98cf945385b8a802e5f9d0ffb4041251c9fa?hp=c9dd98cf945385b8a802e5f9d0ffb4041251c9fa

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