Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 22 May 2009 17:09:38 +0000 (13:09 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 22 May 2009 17:09:38 +0000 (13:09 -0400)
commitb23b7a8d6112aa7519a388ca49a7864d1e86df21
treec45e9f646d6b8246ee116ca90aad454dc0f79424
parentc2e2da6ee2834d6ab68d06048588cdf3a27d3691
parent83826b39cfefd2588da09ca427d48f11a92ea8c0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info