Merge branch 'master' into 3889-functional-testing
authorradhika <radhika@curoverse.com>
Fri, 26 Sep 2014 17:35:14 +0000 (13:35 -0400)
committerradhika <radhika@curoverse.com>
Fri, 26 Sep 2014 17:35:14 +0000 (13:35 -0400)
commit195b23ed7fd0c6261d0a945a9f0e541d78a0648e
tree4b20aa7172d223914b6ca646af78904269328852
parentebdbddd3c85ab869afcf689efd7cb4b6207000b3
parentb506247f4a34e1a409f57c3a01c07a94970fe68f
Merge branch 'master' into 3889-functional-testing

Conflicts:
services/api/test/fixtures/jobs.yml
services/api/test/fixtures/jobs.yml