shipping_tag_processor.php

Merge of "w/in-commerce/branches/5.2.x@16516" to "w/in-commerce/branches/5.3.x@16506".

Conflicts:

• units/coupons/coupons_event_handler.php

Merge of "w/in-commerce/branches/5.2.x@16385" to "w/in-commerce/branches/5.3.x@16392".

Conflicts:

• admin_templates/orders/export/export.tpl
• units/addresses/addresses_config.php
• units/affiliate_payments/affiliate_payments_config.php
• units/affiliates/affiliates_config.php
• units/coupons/coupons_config.php
• units/currencies/currencies_config.php
• units/gateways/gateways_config.php
• units/manufacturers/manufacturers_config.php
• units/order_items/order_items_config.php
• units/orders/orders_config.php
• units/orders/orders_event_handler.php
• units/orders/orders_tag_processor.php
• units/product_option_combinations/product_option_combinations_config.php
• units/products/products_config.php
• units/reports/reports_config.php

Merge of "w/in-commerce/branches/5.2.x@16151" to "w/in-commerce/branches/5.3.x@16185".

Merge of "w/in-commerce/releases/5.2.1-B1@15631" to "w/in-commerce/branches/5.3.x@15656".

Releasing version 'branches/5.3.x' (copy from 'branches/5.2.x') of 'w/in-commerce' module.