tim-kretschmer-c2fo/ci-test — pull request #92 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:35+00:00)
Title: Merge stable/cfo-3314-a54b24eb-144b-4970-b45d-169a5501a83b into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical