master is now 2.0.0.pre
Add method to return the Solr query time for a response.
Merge branch 'jasoncodes-query_time'
[Closes #121] Updates History
Changed paginated_collection to allow setting total_count/total_entries.
Merge pull request #129 from pcg79/master

Added ability to change PaginatedCollection's total_count/total_entries
Add link to conditional indexing article
Merge pull request #130 from mikepack/add-resource-link

Add link to conditional indexing article
Update readme
Add some more_like_this options.
Merge pull request #131 from mikepack/more-like-this-example

More like this example
Fix the "Permission denied - /var/solr" error I was getting when running
tests.  I don't allow access to /var to just anyone.
Updates to sunspot_solr to use the newer solr 3.5 server rather than
the 1.4 server.
Merge branch 'mrcsparker-master'
Changelog
Updates indexing to use batch processing with a config variable
Changelog
Merge branch 'pallan-batch'
Fixes test error under 1.8.7 because Hash order is not necessarily kept
changed stderr to stdout since skipping the progress bar should not be reported as an error