Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 6 Jan 2009 02:27:50 +0000 (21:27 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 6 Jan 2009 02:27:50 +0000 (21:27 -0500)
commit0e7db6bd6f0288b3671daee4ec58b578c7581cee
tree2c2966538ae899ff275aeb5560fb1b6b29366545
parent80f4ecdc5b329e12af088c6dde01ebafc27d8cbf
parente1d94c08f05a57318e3a84bbe37effabfb1b2614
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info