Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Oct 2009 18:26:45 +0000 (14:26 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Oct 2009 18:26:45 +0000 (14:26 -0400)
commit7e1fc67be6326d63fd6946279b2b78b952113c67
treedbfb8d96161763ad401eafc0565ded204523ea5b
parenta09c79ccf1b9523c4b82db8846435c81f7404d44
parent93ddca3e9c420f334cc0bebd53945633452513a3
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info