spree/spree — pull request #4722 by brchristian (2014-05-21 22:19:46+00:00)
Title: Use permalink rather than slug in 2-1 and 2-0

My PR https://github.com/spree/spree/pull/4683 to `master` and `2-2-stable` turned out not to be backwards compatible with `2-1-stable` and `2-0-stable` due to the shift in nomenclature from `:permalink` to `:slug` that happened between 2.1 and 2.2.

This PR patches this and restores functionality to `2-1-stable` and `2-0-stable`.