Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 14 Feb 2008 20:42:50 +0000 (15:42 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 14 Feb 2008 20:42:50 +0000 (15:42 -0500)
commit841617c9ff35d25dd7a89f6905a67a911c22e430
tree96817a53c928bc08195e1af199456a782ee6550a
parent553136ec1f73246cde1dce300b15eec2e5e73a97
parent85145afbd9db050fb2b096f88f82ef36129933f7
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info