Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 20 Jan 2009 16:12:17 +0000 (11:12 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 20 Jan 2009 16:12:17 +0000 (11:12 -0500)
commita9585d231e7bd57bb4da2e962198e59bbbb3d2d1
tree2ce9041549954b1ff48be0bc22ab61cc5864d112
parent8360e96a8661d3cc0532f377db81a3f37babd126
parent4cae94b9fa4892e558160c5d55779064ff4a7add
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info