Merge branch 'release/veritrans_air'
Merge branch 'master' of github.com:hiidef/hiicart
Fallback to shift-jis when cp1252 decoding fails during paypal ipn handling
Merge branch 'hotfix/shiftjis_on_paypal' into develop