merge from 2.0 branch
[monitor.git] / www / __init__.py