Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 2 Oct 2009 16:38:02 +0000 (12:38 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 2 Oct 2009 16:38:02 +0000 (12:38 -0400)
commit1c5a9c0cc8265a6a552b1500eb3a3d2aa17b9720
tree1de50dfe1cf69a6405c1468542ae3603db10f06c
parent0c6648f02c56a867d1078832921b185c3fce310d
parent827c2c8bbe35da51fe3615a2b9a4207e5c56c09c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info