4533: Merge branch 'master' into 4533-remote-reset
authorTom Clegg <tom@curoverse.com>
Fri, 21 Nov 2014 14:41:34 +0000 (09:41 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 21 Nov 2014 14:41:34 +0000 (09:41 -0500)
commit13efb6304b9fcbe0fd3b496c751184c7aa1cc4d0
tree791321d496ba0c541d41ef2b2d3468f665ecd1e3
parent3167e5659918f4679d48bcc7f1fda4c3e4ef096f
parentba251e274d684688217d0b1f8b1c8b14ce13feaf
4533: Merge branch 'master' into 4533-remote-reset

Conflicts:
services/api/db/seeds.rb
apps/workbench/test/integration/pipeline_instances_test.rb
services/api/app/models/database_seeds.rb