spree/spree_active_shipping — pull request #154 by FineLineAutomation (2013-11-19 02:19:51+00:00)
Title: Fixed failing build from PR #152 and PR #153

You should be able to pull this across all the stable branches.