=== != what you think it is unless it’s what you think it is on both sides.
Move changelog message to the correct version
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo
i18n: Big update for es_ES
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo