Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 29 Oct 2009 11:52:04 +0000 (07:52 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 29 Oct 2009 11:52:04 +0000 (07:52 -0400)
commit7280c8894cc26543b091a981e4a7cc310630b45a
tree28fd6a7ed66a324507d81ad91b5d13f5a85bb9ab
parented8953716496354561218cdaf10153a8a4f4259d
parent879f2f683e878ca859f98eb8b182002cdbc69a20
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info