rackerlabs/otter — pull request #582 by dian4554 (2014-03-18 19:19:52+00:00)
Title: Fix merge conflicts

Hope this one works!