Coen Jacobs 4afbd0b556 Merge branch 'function-call-refactor' ... Conflicts: includes/admin/post-types/meta-boxes/class-wc-meta-box-order-data.php includes/shortcodes/class-wc-shortcode-cart.php includes/wc-template-functions.php		2013-11-25 15:42:26 +01:00
..
class-wc-shipping-flat-rate.php	Merge branch 'function-call-refactor'	2013-11-25 15:42:26 +01:00