Merge branch 'master' into 4228-collection-subdir-files
authorradhika <radhika@curoverse.com>
Thu, 23 Oct 2014 20:52:06 +0000 (16:52 -0400)
committerradhika <radhika@curoverse.com>
Thu, 23 Oct 2014 20:52:06 +0000 (16:52 -0400)
commit7149ee5d616b932a73fb7a311136e6db75020666
treecec54fffe6fb2983c8fe93ddd5e60ef9a9ff7815
parenta124a5350d31001a7c66381fa853dfcd78dddd06
parent1ed38089f9d9969abde1849743f0fdf52d3d2d93
Merge branch 'master' into 4228-collection-subdir-files

Conflicts:
apps/workbench/test/integration/collections_test.rb
apps/workbench/test/integration/collections_test.rb