Merge branch 'master' of git@github.com:thoughtbot/paperclip

git-svn-id: https://svn.thoughtbot.com/plugins/paperclip/trunk@451 7bbfaf0e-4d1d-0410-9690-a8bb5f8ef2aa

README

@@ -30,3 +30,4 @@ In your show view:
   <%= image_tag @user.avatar.url(:medium) %>
   <%= image_tag @user.avatar.url(:medium) %>
   <%= image_tag @user.avatar.url(:thumb) %>
   <%= image_tag @user.avatar.url(:thumb) %>
 
 
+