Shopify/active_merchant — pull request #1177 by ntalbott (2014-05-07 19:03:46+00:00)
Title: Balanced v1.1

Re-attempting the v1.1 merge.