Mike Jolley 1bc9da3e91 Merge branch 'master' into WC-CRUD ... # Conflicts: # includes/class-wc-coupon.php		2016-08-04 12:10:04 +01:00
..
class-wc-shipping-legacy-free-shipping.php	Merge branch 'master' into WC-CRUD	2016-08-04 12:10:04 +01:00