spree/spree — pull request #878 by LBRapid (2011-12-15 23:38:24+00:00)
Title: Promotions (Mostly) Working Again

My only real concern is that this causes a few more spec failures, but I am planning to take a look at that first thing tomorrow and get rid of the pending ones. All failures are marked as pending in this pull request.