Merge pull request #1 from richardswain/plugin-updates

WordPress 3.5
git ignore backups
Merge branch 'refs/heads/master' into plugin-updates
WordPress 3.5.1