- Modified a promotion rule to take currency into acount and zone
Merge branch 'watg' of github.com:watg/spree into watg