Merge branch 'master' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 23:41:20 +0000 (19:41 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 23:41:20 +0000 (19:41 -0400)
commitb74b7ab68b983b3f7d9e561eb991b21764cdb3be
tree8abb4c1f92d7f34af6fca32471749776e4bc36e8
parentd0bd30824ec9c1f2af04d9e3d9b13473c8fcb9d8
parentfdf3b7c4b8af5752770a23c94d5427179b9e5605
Merge branch 'master' into autoconfig