Merge branch 'master' into 1776-setup-user-email
authorradhika chippada <radhika@curoverse.com>
Mon, 14 Apr 2014 19:38:32 +0000 (15:38 -0400)
committerradhika chippada <radhika@curoverse.com>
Mon, 14 Apr 2014 19:38:32 +0000 (15:38 -0400)
commiteeeceb21a479780dfa7d550523ab961f477e39ad
treedb61773fcd442a5ebea1486ca69f73664e0eaa73
parent283dbf37a1b7d32332e295070de48b5e6e459248
parent97279656db75b9b7f8282e3b98774a60935d39f3
Merge branch 'master' into 1776-setup-user-email

Conflicts:
services/api/app/controllers/arvados/v1/users_controller.rb
apps/workbench/app/controllers/users_controller.rb
services/api/Gemfile
services/api/Gemfile.lock
services/api/app/controllers/application_controller.rb
services/api/app/controllers/arvados/v1/users_controller.rb
services/api/test/functional/arvados/v1/users_controller_test.rb