spree/spree — pull request #5717 by darbs (2014-12-05 18:13:39+00:00)
Title: merge! fix and spec

Addresses #5701

Note: This also assumes that only the order being merged in is invalid.