From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 9 Aug 2008 15:54:12 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.60~4
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5867c415eee1500f02ccd244c802c9c10a1dfbc2?ds=inline;hp=-c

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

5867c415eee1500f02ccd244c802c9c10a1dfbc2