tim-kretschmer-c2fo/ci-test — pull request #24 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:36:12+00:00)
Title: Merge dev/cfo-1861-872e2915-f19c-4d08-b471-4637ceff4079 into development

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

Code Review

- [ ] @importantguy
- [ ] @supercritical