From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Jun 2010 20:52:33 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100623~45
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f70bc8184ace2cf10687daedf2b7176f32ef8a97?ds=sidebyside;hp=f70bc8184ace2cf10687daedf2b7176f32ef8a97

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