Merge branch 'master' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 26 Jul 2008 19:49:08 +0000 (15:49 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 26 Jul 2008 19:49:08 +0000 (15:49 -0400)
commitcebbb6f482492ba776a1ca542e81a74fb74fbfce
treec3462dbc9036c0611d11987472c8010b785e14c0
parentcab1ac75c91d8c351c41920a02e79484a34428e2
parent8a45362d55a4b563764f997d7419623a17da86ba
Merge branch 'master' into autoconfig