fix bad merge
authorEvan Martin <martine@danga.com>
Tue, 23 Oct 2012 16:37:55 +0000 (09:37 -0700)
committerEvan Martin <martine@danga.com>
Tue, 23 Oct 2012 16:37:55 +0000 (09:37 -0700)
commit18d1b05431c0338d0bcb685e18f4d4d5120fc266
tree94387587f39ab35e3d4d3529106544bea3f8d36d
parente2709bd70462c25f0578408fdeda0d33ac42806e
fix bad merge
bootstrap.py