Merge branch 'master' into 5096-wb-collection-name-or-desc-update
authorRadhika Chippada <radhika@curoverse.com>
Mon, 16 Feb 2015 17:46:00 +0000 (12:46 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Mon, 16 Feb 2015 17:46:00 +0000 (12:46 -0500)
commit5e003c8f9cf47a5bb716dcb75b8e6b98e4680a4c
tree9da13f564ff0ab46947d1ec83782b9c5ebcd34e2
parentf842b72b9e2bb50a68ba388922c55f54ad0399ae
parent8b90f80efca772efd2697ffc70d7809c32564171
Merge branch 'master' into 5096-wb-collection-name-or-desc-update

Conflicts:
apps/workbench/test/controllers/collections_controller_test.rb
apps/workbench/test/controllers/collections_controller_test.rb