Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 12 Mar 2008 18:46:03 +0000 (14:46 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 12 Mar 2008 18:46:03 +0000 (14:46 -0400)
commite3c6b9bb9d6cef040f9c3f8a86337cf340966806
tree255d9bc0637aad820fdc9ff22e115234b0602bd7
parent3dc979470ed07e48c9919b14c0075c44a435cdcd
parent475a7ad55695553c670d8b5554c06c952021628b
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info