Added curl and php version info in tracking
Merge branch 'master' of github.com:Yoast/wordpress-seo
Added extra attributes for tracking
Fix in curl version tracking
Specify post ID when using wp_enqueue_media() to set up correctly for the post being edited.
Code style - spacing around if
The Premium product class is renamed in the next version of Premium so this check needs to change as well.
Clean up of i18n for extensions page as well as code clean up.
Merge branch 'master' of https://github.com/Yoast/wordpress-seo
Check whether snippet preview is shown on page before hiding / showing errors. Fixes #1178
Merge pull request #1155 from Petervw/master

Added extra attributes in tracking, so we can track PHP and CURL versions.
Fix wrong last modified date in sitemap, fixes #1136, #1161
Merge branch 'master' of https://github.com/Yoast/wordpress-seo
Update readme for commits 2e632d874bda9364c49ec2baaa2d6498551141be and b6f52e225d19637d5b16fd43b6a2aa64d6a5b6b8
Merge pull request #1167 from jrfnl/Code-style-fixes

Code style - spacing around if
Merge pull request #1165 from benhuson/wp_enqueue_media

Specify post ID when using wp_enqueue_media() to set up correctly for the post being edited. Props @benhuson.
Update readme for last merge.
Merge branch 'master' of https://github.com/Yoast/wordpress-seo
Fixed unreachable filter `wpseo_sitemap_[post_type]_content` as reported in #1163, also fixes unreachable filter `wpseo_sitemap_author_content`. Props @jakub-klapka. Fixes #1163
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Auto-deactivate-if-no-SPL

Conflicts:
	readme.txt