CCI-MOC/haas — pull request #86 by zenhack (2014-06-02 18:45:07+00:00)
Title: Merge Logan's changes to api.py

This superceeds pull request #82.