tim-kretschmer-c2fo/ci-test — pull request #118 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:59+00:00)
Title: Merge stable/cfo-2134-1f95b014-411d-4a75-b3d2-c388c329c139 into master

https://honeycomb.jira.com/browse/CFO-2134

Code Review

- [ ] @importantguy
- [ ] @supercritical