Merge branch 'v4.3'

NEWS

 master:
 master:
 
 
-* Improvement: Paperclip now supports aws-sdk v2 (@betesh, @davetchen, https://github.com/thoughtbot/paperclip/pull/1903)
-    If your Gemfile contains aws-sdk (>= 2.0.0) and aws-sdk-v1, paperclip will use aws-sdk v2.
-    With aws-sdk v2, S3 storage requires you to set the s3_region.  s3_region may be nested in s3_credentials, and (if not nested in s3_credentials) it may be a Proc.
+* Improvement: Paperclip now supports aws-sdk v2
+  @betesh, @davetchen,
+  https://github.com/thoughtbot/paperclip/pull/1903
+
+  If your Gemfile contains aws-sdk (>= 2.0.0) and aws-sdk-v1, paperclip will use
+  aws-sdk v2. With aws-sdk v2, S3 storage requires you to set the s3_region.
+  s3_region may be nested in s3_credentials, and (if not nested in
+  s3_credentials) it may be a Proc.
+
+4.3.1 (9/9/2015):
+
+* Backport of bugfix to `remove_column`, so it works in Rails 3 and 4
+  c740fb171fe2f88c60b999d2a1c2122f2b8f43e9
+* Fix GeometryParser regex for usage of '@>' flag
+* `url` on a unpersisted record returns default_url
+* spec deprecation warnings and failures
+* README adjustments
 
 
 4.3.0 (6/18/2015):
 4.3.0 (6/18/2015):
 
 

README.md

@@ -95,7 +95,8 @@ to install GhostScript. On Mac OS X, you can also install that using Homebrew:
 
 
     brew install gs
     brew install gs
 
 
-If you're on Ubuntu (or any Debian base Linux distribution), you'll want to run the following with apt-get:
+If you're on Ubuntu (or any Debian base Linux distribution), you'll want to run
+the following with apt-get:
 
 
     sudo apt-get install imagemagick -y
     sudo apt-get install imagemagick -y
 
 
@@ -150,12 +151,6 @@ Include the gem in your Gemfile:
 gem "paperclip", "~> 4.3"
 gem "paperclip", "~> 4.3"
 ```
 ```
 
 
-If you're still using Rails 2.3.x, you should do this instead:
-
-```ruby
-gem "paperclip", "~> 2.7"
-```
-
 Or, if you want to get the latest, you can get master from the main paperclip repository:
 Or, if you want to get the latest, you can get master from the main paperclip repository:
 
 
 ```ruby
 ```ruby

lib/paperclip/version.rb

 module Paperclip
 module Paperclip
-  VERSION = "4.3.0" unless defined? Paperclip::VERSION
+  VERSION = "4.3.1" unless defined? Paperclip::VERSION
 end
 end