2893: Merge branch 'master' into 2893-no-symbols-in-db
authorTom Clegg <tom@curoverse.com>
Fri, 30 May 2014 18:54:27 +0000 (14:54 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 30 May 2014 18:54:27 +0000 (14:54 -0400)
commit8191d7365a61f4d4309c2f0b387188303320a889
tree35360f4c65765dbed43968a59c6cec5d7c86d7b6
parent15cc0bc32eb57c02b566826598c6de2a8587ef9f
parentc7ee5e02cae78d3edff6ed393d776c4995441896
2893: Merge branch 'master' into 2893-no-symbols-in-db

Conflicts:
services/api/test/fixtures/links.yml
services/api/app/models/arvados_model.rb
services/api/test/fixtures/links.yml