spree/spree — pull request #4033 by peterberkenbosch (2013-11-29 10:15:28+00:00)
Title: there is a conflicting migration in 2-1-stable branche 

See 8de75a5d3d519c5498843edda983702852caaade