Merge remote-tracking branch 'origin/master' into origin-2608-websocket-event-bus...
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 25 Apr 2014 15:25:03 +0000 (11:25 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 25 Apr 2014 15:25:03 +0000 (11:25 -0400)
commit4eb42fd91dc5e50840e0d3db5d5201561602a508
tree607766b06fcca6bd7f646a9acc13ed4c72f4067b
parent7c12fc4d989dd2b4c47a174280a4f9526ecb0798
parentd61f56590d4c1bc2c965b640698217a5d4af1d8c
Merge remote-tracking branch 'origin/master' into origin-2608-websocket-event-bus-alt2

Conflicts:
services/api/app/controllers/application_controller.rb
services/api/db/schema.rb
services/api/test/test_helper.rb
apps/workbench/config/routes.rb
services/api/app/controllers/application_controller.rb
services/api/db/schema.rb
services/api/test/test_helper.rb