spree/spree — pull request #3640 by huoxito (2013-08-26 16:47:39+00:00)
Title: 2-0-stable fix order_decorator conflict

#3636 left two failings specs. This one should get a green build again.