Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 19 Jul 2009 12:54:38 +0000 (14:54 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 19 Jul 2009 12:54:38 +0000 (14:54 +0200)
commit06b54358ed532074cc9f5eef0d5e657031977b82
tree7ccad2d16a284f34779a6c291911f253c5e0caed
parentf08bd11f4202da9d842884f609930957926fcec0
parent74df788ca45b1843e9a3f790b12d0c030e0e4d0e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info