spree/spree — pull request #2181 by GeekOnCoffee (2012-11-05 20:31:29+00:00)
Title: Don't override flash message if there's a promotion error

Goes along with a PR coming shortly for spree_paypal_express