Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 12 Mar 2010 20:21:07 +0000 (15:21 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 12 Mar 2010 20:21:07 +0000 (15:21 -0500)
commit0b4261c4587ae76057c14f3fa8c241292dd2b302
treefa30eaabad63ffda19cd39259336054b352a5dc2
parent20bf162e30e26e7e3bd97edc3b0c5956ec0f7791
parent844bb8134b5ff6e3d73dc3c8b91ed516fa618c41
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info