added the ability not to delete historic slugs when the sluggable class is destroyed
Merge branch 'master' into conditional_destruction_of_historic_slugs
allow any :dependent => option to be passed
If there is no error in friendly_id attribute then #move_friendly_id_error_to_name removes any existing error from the name attribute.
Merge pull request #285 from nolamesa/patch-1

Move_friendly_id_error_to_name example method removes errors on name field
Fix reserved words example

See pull request #285.
Fix example for Rails 3.1

Avoid using has_key? as it is not available on 3.1.
Update example code
Update changelog
Rename I18n test to Simple I18n test to match lib
Fix English grammar error in test definition
Add regression test for currently incorrect usage of i18n API

See issue #281
Update lib/friendly_id/simple_i18n.rb
Updated changelog
Add failing test for issue #259
return old slug if new slug is nil, fixes #259
Updated changelog

The previously pulled commit closes #259 and closes #279.
Bump version

[ci skip]
Allow use of single dashes as sequence separator
Fix for names ending in numbers and using single dash