Merge branch 'tova'
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 24 Jul 2008 16:37:17 +0000 (12:37 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 24 Jul 2008 16:37:17 +0000 (12:37 -0400)
commitcf597d71665d11815640569eda017825ca0c20bc
tree07e5d1eae386d90df24dbd9e32ac7ac5141d5b02
parentaf8e847c7b572cf1c8a18bf9fe14b7172058fd5c
parentc2f621cb1c2eb8bb898acfbfac059c5ee2d9568e
Merge branch 'tova'