Merge remote-tracking branch 'origin' into 1678-new-active-user-orientation
authorPeter Amstutz <peter.amstutz@clinicalfuture.com>
Thu, 26 Dec 2013 18:19:00 +0000 (13:19 -0500)
committerPeter Amstutz <peter.amstutz@clinicalfuture.com>
Thu, 26 Dec 2013 18:19:00 +0000 (13:19 -0500)
commitab3f9742f002e3af4339c17eede2b6ee99df83b2
treea3f9c21359abecdce219ffa3595441b7f205d01a
parent92208a37142717bc9b70a95f889950639e584d58
parenta75d871fff6f85f2a102d0f17b6219cfe799abe0
Merge remote-tracking branch 'origin' into 1678-new-active-user-orientation
apps/workbench/app/controllers/application_controller.rb