Merge branch 'master' into 2257-inequality-conditions
authorTom Clegg <tom@curoverse.com>
Fri, 14 Mar 2014 14:17:46 +0000 (10:17 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 14 Mar 2014 14:17:46 +0000 (10:17 -0400)
commit35336cd73e444534cb2eda20e3730464cc4e6553
tree82b111ec1fc984f0465defe750cdf6aa6d896ae8
parent63e8f77e963949d4187555411e7b5c60fc850468
parent113d3f94224ca507ff6341ab61ac98429cad711e
Merge branch 'master' into 2257-inequality-conditions
services/api/app/controllers/application_controller.rb
services/api/app/models/arvados_model.rb