Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 20 Sep 2010 00:15:38 +0000 (20:15 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 20 Sep 2010 00:15:38 +0000 (20:15 -0400)
commit012300404e86578e24ab3f07ded9f1ba89c39b2a
treeeb24531fc11af67b58343daf4b68cb5fa66130fa
parent8063b960ade41a089d859b655ff26fb61fb18d3f
parent2745dfee60fa890ed0ecb8f53528e8a8a0803066
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info