spree/spree — comment on commit 39e7fdcbf12c160b5f9ee543c6db8d84e6780b60
File:  line 0
By schof:

Dude! No merge commits please. Fortunately I think we can fix this when we rebase on master.