Merge branch 'master' into 4523-full-text-search
authorRadhika Chippada <radhika@curoverse.com>
Sun, 8 Feb 2015 20:54:14 +0000 (15:54 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Sun, 8 Feb 2015 20:54:14 +0000 (15:54 -0500)
commit2e5ac62b550f7dd608cf133ae66ef04f801be76b
tree5cb1e6e5cdbf593c7fc2d0edda49d7a5369eba93
parent9b59cd2f10fa44f4cdbf8986b08e92bdde5a62a7
parent64c70939c414881de61ac65512701d0ba4068786
Merge branch 'master' into 4523-full-text-search

Conflicts:
services/api/test/unit/collection_test.rb
services/api/app/models/collection.rb
services/api/db/structure.sql
services/api/test/unit/collection_test.rb