From 336f4f0e86976ba708eee16404b5e165508f96fa Mon Sep 17 00:00:00 2001
From: Joost de Valk <joost@yoast.com>
Date: Thu, 4 Sep 2014 20:12:02 +0200
Subject: [PATCH] Update changelog, version bump, few small textual changes to
 description.

---
 googleanalytics.php | 12 ++++++------
 readme.txt          | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/googleanalytics.php b/googleanalytics.php
index 5da57612..c4b358df 100644
--- a/googleanalytics.php
+++ b/googleanalytics.php
@@ -1,12 +1,12 @@
 <?php
 /*
 Plugin Name: Google Analytics by Yoast
-Plugin URI: http://yoast.com/wordpress/google-analytics/#utm_source=wordpress&utm_medium=plugin&utm_campaign=wpgaplugin&utm_content=v500
-Description: This plugin makes it simple to add Google Analytics to your WordPress blog, adding lots of features, eg. custom variables and automatic clickout and download tracking.
-Author: Joost de Valk
-Version: 5.0.2
+Plugin URI: https://yoast.com/wordpress/plugins/google-analytics/#utm_source=wordpress&utm_medium=plugin&utm_campaign=wpgaplugin&utm_content=v504
+Description: This plugin makes it simple to add Google Analytics to your WordPress blog, adding lots of features, eg. error page, search result and automatic clickout and download tracking.
+Author: Team Yoast
+Version: 5.0.4
 Requires at least: 3.8
-Author URI: http://yoast.com/
+Author URI: https://yoast.com/
 License: GPL v3
 Text Domain: google-analytics-for-wordpress
 Domain Path: /languages
@@ -30,7 +30,7 @@
 
 // This plugin was originally based on Rich Boakes' Analytics plugin: http://boakes.org/analytics, but has since been rewritten and refactored multiple times.
 
-define( "GAWP_VERSION", '5.0.2' );
+define( "GAWP_VERSION", '5.0.4' );
 
 define( "GAWP_FILE", __FILE__ );
 
diff --git a/readme.txt b/readme.txt
index fab0a9bf..51f04d79 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://yoast.com/donate/
 Tags: analytics, google analytics, statistics, tracking, stats, google, yoast
 Requires at least: 3.8
 Tested up to: 4.0
-Stable tag: 5.0.2
+Stable tag: 5.0.4
 
 Track your WordPress site easily with the latest tracking codes and lots added data for search result pages and error pages.
 
@@ -49,6 +49,23 @@ This section describes how to install the plugin and get it working.
 
 == Changelog ==
 
+= 5.0.4 =
+Release Date: September 4th, 2014
+
+* Bugfixes:
+	* Fix small error in GA setup error link.
+	* Fix bug that would remove attributes from links.
+	* Added Try/Catch around connect to Google Analytics to prevent uncaught exceptions.
+	* Move require of function file to prevent error with already defined functions.
+	* Fix bug that sometimes prevented saving user roles to be ignored.
+	* Fix several notices.
+* Enhancements:
+	* Add links to Settings page and Knowledge Base on plugins page.
+	* No longer store result from Google API in the main option, saves memory on frontend.
+
+= 5.0.3 =
+Skipped due to error during release.
+
 = 5.0.2 =
 Release Date: September 4th, 2014