ed5e32b916c7b7a1b3ac2ba2c7603e2908f1640c a2a6a784331cc733318d69bdd5c486fe08640c16 Norman Clarke norman@addthree.com http://github.com/norman/friendly_id/commit/78b38a5b7d64bc813d0347058b7306fe19f117ab 78b38a5b7d64bc813d0347058b7306fe19f117ab 2008-07-14T14:16:00-07:00 2008-07-14T14:16:00-07:00 Merge branch 'master' of git://github.com/alistairholt/friendly_id into alistairholt/master 6919e54b72d5052adf0774e7aaef5a4f7c39dbd1 Norman Clarke norman@addthree.com