spree/spree — pull request #2971 by jdutil (2013-05-02 19:36:57+00:00)
Title: Remove extra file backup.

Think it was left over by a git conflict at some point.