Dropped rails2 checks - we get a dependency hell when we try with the latest delayed_job.
Forgot to remove the rails2 gemfile from .travis.yml
Removed rails2-style instructions. [ci skip]
Merge branch 'dropping-rails2-support'
Merged in upstream #67.
Staging the update to paperclip 3.3.0.
Fix processing column being updated before writes are flushed
Merge pull request #7 from elevation/master

Fix processing column being updated before writes are flushed
Working on updating to paperclip 3.

Thanks Rahul garg from stackoverflow! http://stackoverflow.com/questions/13238371/

Two tests still fail. Need to figure out why.
Bye-bye 1.8.7 and ree.
A few real world tests, and then we should be all set to work with paperclip 3.
Release delayed_paperclip 2.5.0.0, compatible with rails 3 and paperclip 3.
Merge branch 'master' of https://github.com/jrgifford/delayed_paperclip
Had to do a last minute merge, yank and push dance there
Gemfile.locks needed an update.
No longer appends timestamp to default_url when job is processing
added option to add custom reprocessing image and added correct asserts to some tests
Merge pull request #10 from ScotterC/custom-processing-url

added option to add custom reprocessing image
Update lib/delayed_paperclip/url_generator.rb

Found this was necessary because not all images have delayed_options but will still be affected by the url_generator.
Merge pull request #11 from endoscient/master

Don't append timestamp to default url while processing