Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 5 Jun 2009 20:58:37 +0000 (16:58 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 5 Jun 2009 20:58:37 +0000 (16:58 -0400)
commit1e081cf7e404fc403d063d39614e8c9a6583f17f
tree032941133aa6d06dd2ae4420c5b0b5b9987802f6
parent0293ae8e3d8e7dfd0a92bf20aa4c3d28e2d78ddb
parente8bd089583597539e37bdf1634741f2686947490
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info