norman/friendly_id — pull request #235 by erikogan (2012-02-23 00:45:10+00:00)
Title: Historic slug conflicts

We added a fix for the failing test submitted by @earnold. It patches the history plugin by adding custom SlugGenerator overrides. When querying for slug conflicts, it checks the Slug model instead of the sluggable model.

And here's a picture of an adorable baby polar bear to make up for the previous bad pull request:
![Knut the cute polar bear](http://upload.wikimedia.org/wikipedia/commons/8/80/Knut_IMG_8095.jpg)