Auto merge of #25316 - brson:installer, r=alexcrichton

Revert an accidental revert.
This commit is contained in:
bors 2015-05-12 17:27:11 +00:00
commit 3ca008dcf1

@ -1 +1 @@
Subproject commit ebc6b04c29591108d3f28e724b4b9b74cd1232e6
Subproject commit e54d4823d26cdb3f98e5a1b17e1c257cd329aa61