Merge pull request #1 from libretro/master
authormeepingsnesroms <guicrith@gmail.com>
Fri, 7 Apr 2017 16:12:17 +0000 (09:12 -0700)
committerGitHub <noreply@github.com>
Fri, 7 Apr 2017 16:12:17 +0000 (09:12 -0700)
update from master


Trivial merge