git ignore backups
Merge branch 'refs/heads/master' into plugin-updates
WordPress 3.5.1
Merge pull request #2 from richardswain/plugin-updates

Core updates