tim-kretschmer-c2fo/ci-test — pull request #47 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:36:31+00:00)
Title: Merge stable/cfo-3723-f82f11a6-6836-4a89-a718-4a1fbbbf3b66 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical