Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info into tova
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 1 Jul 2008 22:41:47 +0000 (18:41 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 1 Jul 2008 22:41:47 +0000 (18:41 -0400)
commit96da041907bcd4e74be6b2beef06d265708644ee
tree2be8097d58009147bbd124ba9c686c03167ff1ce
parent0abaf5aaae14efafb4610bfc3b35d0bb111089fb
parent8c6577c3dc8d904231375642b5d9ac2758246edc
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info into tova