Merge branch 'hotfix/enhance_paypal_decoding'
Merge branch 'release/django1.6'
Merge branch 'master' of ssh://github.com/hiidef/hiicart
Extend the length of the shipping option name field
Merge branch 'hotfix/shipping_option_length' into develop