spree/spree — pull request #3636 by lareb (2013-08-26 10:09:39+00:00)
Title: Update order_decorator.rb

code was conflict, must be fine now.