Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Feb 2010 16:50:24 +0000 (11:50 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Feb 2010 16:50:24 +0000 (11:50 -0500)
commit4b1da14612c26981055dd186deacc004f93bdad0
treee1e6d327f67c9d200a64cf4c3a9d8334dcd3a9e4
parentb3c3c42b269c102123dcd80979cb9c49ce13bca7
parent983ecb0915b27f33e14e4b2e20090df69419f374
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info