Merge branch 'rails3.2' of github.com:goncalossilva/acts_as_paranoid into rails3.2