Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 10 Jun 2010 18:15:10 +0000 (14:15 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 10 Jun 2010 18:15:10 +0000 (14:15 -0400)
commit5e6aae48fd777b8735f97b9473146903c8e204c3
tree2f5bc38c0783bb0e66337b0a46501ac073dc5d61
parent23aaa5ac45f389a741afdac6d87e077a2e44fe8b
parent0fbec10a42c0b6ae3111d5a5d5488cd5d573f554
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info