Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 3.14159
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 16 Jul 2009 18:46:09 +0000 (14:46 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 16 Jul 2009 18:46:09 +0000 (14:46 -0400)
commit7db41e1aa97f5f30a9bb523c939cce192cc104c7
treeeee30477d218c523b5b4b7085370c491cbdb407b
parent8f971999c6cbf7025500a84ef5125019d373d8cd
parent295a9e11cd58f92b105107398e9b78081ed55253
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info