Sorry i added maginal changes after your merge from https://github.com/esp8266/Arduino/pull/802#831

Merged

igrr merged 2 commits intoesp8266:esp8266from

pgollor:SPIFFS-OTA

Sep 29, 2015

Commits on Sep 28, 2015

update espota.py help and add chipd id to hostname from OTA-mDNS-SPIFFS example for better identification
pgollor
committed
Merge branch 'esp8266' into SPIFFS-OTA
pgollor
committed