Merge pull request #2 from libretro/master
authormeepingsnesroms <guicrith@gmail.com>
Fri, 1 Sep 2017 18:21:48 +0000 (11:21 -0700)
committerGitHub <noreply@github.com>
Fri, 1 Sep 2017 18:21:48 +0000 (11:21 -0700)
Update from master


Trivial merge