Merge pull request #11 from notaz/upstream_merge
authorTwinaphex <libretro@gmail.com>
Sat, 20 Dec 2014 19:43:18 +0000 (20:43 +0100)
committerTwinaphex <libretro@gmail.com>
Sat, 20 Dec 2014 19:43:18 +0000 (20:43 +0100)
Upstream merge


Trivial merge