Merge pull request #978 from martine/revert-971-bootstrap-out-of-source
authorNico Weber <nicolasweber@gmx.de>
Mon, 22 Jun 2015 20:44:24 +0000 (13:44 -0700)
committerNico Weber <nicolasweber@gmx.de>
Mon, 22 Jun 2015 20:44:24 +0000 (13:44 -0700)
Revert "Bootstrap out of source"


Trivial merge