Merge pull request #85 from alexis-puska/master_merged
authorTwinaphex <libretro@gmail.com>
Mon, 19 Dec 2016 21:47:05 +0000 (22:47 +0100)
committerGitHub <noreply@github.com>
Mon, 19 Dec 2016 21:47:05 +0000 (22:47 +0100)
Master merged


Trivial merge