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

This superseeds pull request #82.