Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 20:14:23 +0000 (16:14 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 20:14:23 +0000 (16:14 -0400)
commite9551afc5f2e5a5e8ef28f5e68d5159692cba9dc
tree44b42ae30a25cadb729dd61971baae052cff0590
parent6a30b45e7521f98a3e94b04ff46eeeb7f80774ca
parent86e73e42e835821984fdf6dc5671dae06cec5f90
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info