Merge pull request #33 from dankcushions/master
authorTwinaphex <libretro@gmail.com>
Fri, 22 Apr 2016 15:06:53 +0000 (17:06 +0200)
committerTwinaphex <libretro@gmail.com>
Fri, 22 Apr 2016 15:06:53 +0000 (17:06 +0200)
Merging in latest upstream changes


Trivial merge