Merge remote-tracking branch 'upstream/master'

readme.txt

@@ -150,6 +150,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 ==
 
 * Fix - Strange error where detecting the page (is_page etc) would break the canonical redirect in some instances when hooked into 'wp'. Used the later get_header hook instead.
+* Fix - fix for https://bugs.php.net/bug.php?id=61166 (thanks Max Rice)
 
 = 1.5.6 - 17/05/2012 =
 * Feature - Default display for shipping methods is radio buttons. Before, when methods were enabled/disabled based on coupons or customer, changed methods could go unnoticed. Radio options are always visible.

woocommerce-core-functions.php

@@ -20,6 +20,7 @@
  * @param mixed $dim
  * @param mixed $unit 'in', 'm', 'cm', 'm'
  * @return void
+ *                                                                      
  */
 function woocommerce_get_dimension( $dim, $to_unit ) {