Make whitespace consistant. Most of the file used tab indentation but a few lines were spaces. All are now tab indentation.
Add support for Display Advertising in Universal Analytics in addition to the existing support in Classic Analytics
Woocommerce::add_inline_js deprecated. Using wc_enqueue_js instead.
Changed get_shipping() to get_total_shipping() to comply with WooCommerce 2.1
Merge pull request #14 from matt-h/master

Make whitespace consistant.
Merge pull request #18 from robertfranksargent/master

Updates to comply with WooCommerce 2.1
updating read me
adding common issue to FAQ
Merge pull request #15 from matt-h/ua-display

Universal Analytics Display Advertising support
yoda conditions. see #15
adding parenthesis for clarify
updating readme
Merge github.com:woothemes/woocommerce-google-analytics-integration into 3rdparty

Conflicts:
	includes/class-wc-google-analytics-integration.php