mesosphere/marathon — pull request #115 by ConnorDoyle (2014-01-14 21:43:08+00:00)
Title: Catch `api-v2` up to `master`

@ssorallen Performed a test merge locally, build looks OK.