Bump version for release.
Back to dev version.
Merge branch 'rails3.2'

Conflicts:
	rails3_acts_as_paranoid.gemspec
Merge branch 'rails3.2'

Conflicts:
	rails3_acts_as_paranoid.gemspec
Make mass assignment of the paranoid column an option.
Fixing zentest to latest version and updating travis.yml
Removing zentest
Merge branch 'rails3.2' of git://github.com/goncalossilva/acts_as_paranoid into rails3.2
Merge branch 'master' of git://github.com/goncalossilva/acts_as_paranoid into rails3.2

Conflicts:
	acts_as_paranoid.gemspec
Merge pull request #123 from DatekWireless/rails3.2

Make mass assignment of the paranoid column an option.
Removed attr_protected since, by definition, it negates any attr_accessible that was set.
Update README.markdown

I added a note in hopes of saving others the 90 minutes I spent learning the hard way that when `acts_as_paranoid` is above `self.table_name = 'foos'` in the Bar class, then your SQL will have "bars"."deleted_at" which will cause errors.
Merge pull request #135 from timscott/patch-1

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