spree/spree — pull request #5839 by BenMorganIO (2014-12-27 04:34:58+00:00)
Title: Merge master into rails 4 2

The purpose of this merge is actually to get the frontend specs on rails-4-2 passing. I'm hoping those failures were due to the russian ruples.