spree/spree — pull request #5237 by athal7 (2014-08-19 21:55:24+00:00)
Title: Fix potential tax calculation issues with charging of unreturned expedited exchanges

* Test that taxes are included
* Make sure to hit all state machine transition events

Conflicts:
core/lib/tasks/exchanges.rake